Mercurial > emacs
annotate src/dispnew.c @ 96949:057eba119104
Also, plans for deprecating Solaris on IBM RS6000 and UNIX System V.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 23 Jul 2008 23:39:39 +0000 |
parents | d75d7cb75fdd |
children | 9592c50233ab |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
79759 | 4 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
314 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94946
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
314 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94946
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94946
diff
changeset
|
11 (at your option) any later version. |
314 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94946
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
314 | 20 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
21 #include <config.h> |
314 | 22 #include <signal.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
23 #include <stdio.h> |
314 | 24 #include <ctype.h> |
25 | |
21514 | 26 #ifdef HAVE_UNISTD_H |
27 #include <unistd.h> | |
28 #endif | |
29 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
30 #include "lisp.h" |
314 | 31 #include "termchar.h" |
32 #include "termopts.h" | |
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
33 /* cm.h must come after dispextern.h on Windows. */ |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
34 #include "dispextern.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
35 #include "cm.h" |
314 | 36 #include "buffer.h" |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42835
diff
changeset
|
37 #include "character.h" |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
38 #include "keyboard.h" |
764 | 39 #include "frame.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
40 #include "termhooks.h" |
314 | 41 #include "window.h" |
42 #include "commands.h" | |
43 #include "disptab.h" | |
44 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
45 #include "intervals.h" |
15065 | 46 #include "blockinput.h" |
21514 | 47 #include "process.h" |
314 | 48 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
49 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
50 include the following file. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 /* #include "systty.h" */ |
12917 | 52 #include "syssignal.h" |
554 | 53 |
314 | 54 #ifdef HAVE_X_WINDOWS |
55 #include "xterm.h" | |
25012 | 56 #endif /* HAVE_X_WINDOWS */ |
314 | 57 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
58 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
62 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
63 #include "macterm.h" |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
64 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
65 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
66 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
67 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
68 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
69 |
25012 | 70 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
71 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
72 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
73 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
74 |
25012 | 75 /* To get the prototype for `sleep'. */ |
76 | |
77 #ifdef HAVE_UNISTD_H | |
78 #include <unistd.h> | |
79 #endif | |
80 | |
314 | 81 /* Get number of chars of output now in the buffer of a stdio stream. |
25012 | 82 This ought to be built in in stdio, but it isn't. Some s- files |
83 override this because their stdio internals differ. */ | |
84 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
85 #ifdef __GNU_LIBRARY__ |
25012 | 86 |
87 /* The s- file might have overridden the definition with one that | |
88 works for the system's C library. But we are using the GNU C | |
89 library, so this is the right definition for every system. */ | |
90 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
91 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
92 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
93 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
94 #undef PENDING_OUTPUT_COUNT |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
95 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
96 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
97 #else /* not __GNU_LIBRARY__ */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
98 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
99 #include <stdio_ext.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
100 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE) |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
101 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
102 #ifndef PENDING_OUTPUT_COUNT |
314 | 103 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
104 #endif | |
25012 | 105 #endif /* not __GNU_LIBRARY__ */ |
106 | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
107 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 108 #include <term.h> /* for tgetent */ |
109 #endif | |
25012 | 110 |
111 /* Structure to pass dimensions around. Used for character bounding | |
112 boxes, glyph matrix dimensions and alike. */ | |
113 | |
114 struct dim | |
115 { | |
116 int width; | |
117 int height; | |
118 }; | |
119 | |
120 | |
121 /* Function prototypes. */ | |
122 | |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
123 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
124 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
125 static int showing_window_margins_p P_ ((struct window *)); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
126 static void fake_current_matrices P_ ((Lisp_Object)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
127 static void redraw_overlapping_rows P_ ((struct window *, int)); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
128 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 129 static int count_blanks P_ ((struct glyph *, int)); |
130 static int count_match P_ ((struct glyph *, struct glyph *, | |
131 struct glyph *, struct glyph *)); | |
132 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
133 static void update_frame_line P_ ((struct frame *, int)); | |
134 static struct dim allocate_matrices_for_frame_redisplay | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
135 P_ ((Lisp_Object, int, int, int, int *)); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
136 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
25012 | 137 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
138 static void adjust_frame_glyphs P_ ((struct frame *)); | |
139 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
140 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
141 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
142 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
143 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 144 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
145 #if GLYPH_DEBUG |
25012 | 146 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
147 #endif |
25012 | 148 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
149 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
150 struct window *)); | |
151 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
152 struct window *)); | |
153 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
154 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
155 static void adjust_frame_glyphs_initially P_ ((void)); | |
156 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
157 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
158 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
159 static void build_frame_matrix P_ ((struct frame *)); | |
160 void clear_current_matrices P_ ((struct frame *)); | |
161 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
162 int, int)); | |
163 static void clear_window_matrices P_ ((struct window *, int)); | |
164 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
165 static int scrolling_window P_ ((struct window *, int)); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
166 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 167 static void update_marginal_area P_ ((struct window *, int, int)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
168 static int update_text_area P_ ((struct window *, int)); |
25012 | 169 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
170 int)); | |
171 static void mirror_make_current P_ ((struct window *, int)); | |
172 void check_window_matrix_pointers P_ ((struct window *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
173 #if GLYPH_DEBUG |
25012 | 174 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
175 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
176 #endif |
25012 | 177 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
178 static int update_window_tree P_ ((struct window *, int)); | |
179 static int update_window P_ ((struct window *, int)); | |
180 static int update_frame_1 P_ ((struct frame *, int, int)); | |
181 static void set_window_cursor_after_update P_ ((struct window *)); | |
182 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
183 struct glyph_row *, int)); |
25012 | 184 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
185 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
186 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
187 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
188 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
189 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 190 |
191 | |
192 /* Non-zero means don't pause redisplay for pending input. (This is | |
193 for debugging and for a future implementation of EDT-like | |
194 scrolling. */ | |
195 | |
196 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
197 |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
198 /* Define PERIODIC_PREEMPTION_CHECKING to 1, if micro-second timers |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
199 are supported, so we can check for input during redisplay at |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
200 regular intervals. */ |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
201 #ifdef EMACS_HAS_USECS |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
202 #define PERIODIC_PREEMPTION_CHECKING 1 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
203 #else |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
204 #define PERIODIC_PREEMPTION_CHECKING 0 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
205 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
206 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
207 #if PERIODIC_PREEMPTION_CHECKING |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
208 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
209 /* If a number (float), check for user input every N seconds. */ |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
210 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
211 Lisp_Object Vredisplay_preemption_period; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
212 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
213 /* Redisplay preemption timers. */ |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
214 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
215 static EMACS_TIME preemption_period; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
216 static EMACS_TIME preemption_next_check; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
217 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
218 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
219 |
554 | 220 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 221 current contents of actual terminal frame; clear and redraw it. */ |
314 | 222 |
764 | 223 int frame_garbaged; |
314 | 224 |
25012 | 225 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 226 |
227 int display_completed; | |
228 | |
25012 | 229 /* Lisp variable visible-bell; enables use of screen-flash instead of |
230 audible bell. */ | |
314 | 231 |
232 int visible_bell; | |
233 | |
764 | 234 /* Invert the color of the whole frame, at a low level. */ |
314 | 235 |
236 int inverse_video; | |
237 | |
238 /* Line speed of the terminal. */ | |
239 | |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42835
diff
changeset
|
240 EMACS_INT baud_rate; |
314 | 241 |
25012 | 242 /* Either nil or a symbol naming the window system under which Emacs |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
243 creates the first frame. */ |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
244 |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
245 Lisp_Object Vinitial_window_system; |
314 | 246 |
247 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 248 |
314 | 249 Lisp_Object Vwindow_system_version; |
250 | |
25012 | 251 /* Vector of glyph definitions. Indexed by glyph number, the contents |
252 are a string which is how to output the glyph. | |
314 | 253 |
254 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 255 as a character code. |
256 | |
257 This is an obsolete feature that is no longer used. The variable | |
258 is retained for compatibility. */ | |
314 | 259 |
260 Lisp_Object Vglyph_table; | |
261 | |
262 /* Display table to use for vectors that don't specify their own. */ | |
263 | |
264 Lisp_Object Vstandard_display_table; | |
265 | |
25012 | 266 /* Nonzero means reading single-character input with prompt so put |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
267 cursor on mini-buffer after the prompt. Positive means at end of |
25012 | 268 text in echo area; negative means at beginning of line. */ |
269 | |
314 | 270 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
271 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
272 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 273 |
314 | 274 |
25012 | 275 /* The currently selected frame. In a single-frame version, this |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
276 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
277 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
278 Lisp_Object selected_frame; |
25012 | 279 |
280 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 281 frames. This is usually the most recent such frame that was |
9572 | 282 selected. In a single-frame version, this variable always holds |
283 the address of the_only_frame. */ | |
25012 | 284 |
285 struct frame *last_nonminibuf_frame; | |
286 | |
287 /* 1 means SIGWINCH happened when not safe. */ | |
288 | |
289 int delayed_size_change; | |
290 | |
291 /* 1 means glyph initialization has been completed at startup. */ | |
292 | |
293 static int glyphs_initialized_initially_p; | |
294 | |
295 /* Updated window if != 0. Set by update_window. */ | |
296 | |
297 struct window *updated_window; | |
298 | |
299 /* Glyph row updated in update_window_line, and area that is updated. */ | |
300 | |
301 struct glyph_row *updated_row; | |
302 int updated_area; | |
303 | |
304 /* A glyph for a space. */ | |
305 | |
306 struct glyph space_glyph; | |
307 | |
308 /* Non-zero means update has been performed directly, so that there's | |
309 no need for redisplay_internal to do much work. Set by | |
310 direct_output_for_insert. */ | |
311 | |
312 int redisplay_performed_directly_p; | |
313 | |
314 /* Counts of allocated structures. These counts serve to diagnose | |
315 memory leaks and double frees. */ | |
316 | |
317 int glyph_matrix_count; | |
318 int glyph_pool_count; | |
319 | |
320 /* If non-null, the frame whose frame matrices are manipulated. If | |
321 null, window matrices are worked on. */ | |
322 | |
323 static struct frame *frame_matrix_frame; | |
324 | |
325 /* Non-zero means that fonts have been loaded since the last glyph | |
326 matrix adjustments. Redisplay must stop, and glyph matrices must | |
327 be adjusted when this flag becomes non-zero during display. The | |
328 reason fonts can be loaded so late is that fonts of fontsets are | |
94946
6009a07ef854
(fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents:
94909
diff
changeset
|
329 loaded on demand. Another reason is that a line contains many |
6009a07ef854
(fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents:
94909
diff
changeset
|
330 characters displayed by zero width or very narrow glyphs of |
6009a07ef854
(fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents:
94909
diff
changeset
|
331 variable-width fonts. */ |
25012 | 332 |
333 int fonts_changed_p; | |
334 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
335 /* Convert vpos and hpos from frame to window and vice versa. |
25012 | 336 This may only be used for terminal frames. */ |
337 | |
338 #if GLYPH_DEBUG | |
339 | |
340 static int window_to_frame_vpos P_ ((struct window *, int)); | |
341 static int window_to_frame_hpos P_ ((struct window *, int)); | |
342 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
343 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
344 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 /* One element of the ring buffer containing redisplay history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 char trace[512 + 100]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 }; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
358 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 static struct redisplay_history redisplay_history[REDISPLAY_HISTORY_SIZE]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 /* A tick that's incremented each time something is added to the |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 static void add_frame_display_history P_ ((struct frame *, int)); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 static void add_window_display_history P_ ((struct window *, char *, int)); |
71141 | 372 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 /* Add to the redisplay history how window W has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 MSG is a trace containing the information how W's glyph matrix |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
375 has been constructed. PAUSED_P non-zero means that the update |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
385 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
386 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
390 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
391 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 && STRINGP (XBUFFER (w->buffer)->name)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
396 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 strcat (buf, msg); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
400 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 /* Add to the redisplay history that frame F has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 PAUSED_P non-zero means that the update has been interrupted for |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
413 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
414 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
418 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
419 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
420 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 f, paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
423 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
424 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
425 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 Sdump_redisplay_history, 0, 0, "", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
427 doc: /* Dump redisplay history to stderr. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
428 () |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
429 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
430 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
431 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
432 for (i = history_idx - 1; i != history_idx; --i) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
433 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
434 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
435 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
436 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
437 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
438 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
439 return Qnil; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
440 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
441 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
442 |
25012 | 443 #else /* GLYPH_DEBUG == 0 */ |
444 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
445 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + WINDOW_TOP_EDGE_LINE (W)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
446 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
25012 | 447 |
448 #endif /* GLYPH_DEBUG == 0 */ | |
449 | |
450 | |
451 /* Like bcopy except never gets confused by overlap. Let this be the | |
452 first function defined in this file, or change emacs.c where the | |
453 address of this function is used. */ | |
314 | 454 |
455 void | |
456 safe_bcopy (from, to, size) | |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
457 const char *from; |
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
458 char *to; |
314 | 459 int size; |
460 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
461 if (size <= 0 || from == to) |
314 | 462 return; |
463 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
464 /* 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
|
465 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
|
466 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
|
467 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
|
468 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
469 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
470 /* 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
|
471 else |
314 | 472 { |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
473 register const char *endf = from + size; |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
474 register char *endt = to + size; |
314 | 475 |
476 /* If TO - FROM is large, then we should break the copy into | |
477 nonoverlapping chunks of TO - FROM bytes each. However, if | |
478 TO - FROM is small, then the bcopy function call overhead | |
479 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
|
480 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
|
481 bad, I'm trying to err in its favor. */ |
314 | 482 if (to - from < 64) |
483 { | |
484 do | |
485 *--endt = *--endf; | |
486 while (endf != from); | |
487 } | |
488 else | |
489 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
490 for (;;) |
314 | 491 { |
492 endt -= (to - from); | |
493 endf -= (to - from); | |
494 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
495 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
496 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
497 |
314 | 498 bcopy (endf, endt, to - from); |
499 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
500 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
501 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 502 little left over. The amount left over is (endt + (to - |
503 from)) - to, which is endt - from. */ | |
314 | 504 bcopy (from, to, endt - from); |
505 } | |
506 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
507 } |
314 | 508 |
25012 | 509 |
510 | |
511 /*********************************************************************** | |
512 Glyph Matrices | |
513 ***********************************************************************/ | |
514 | |
515 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
516 pool from which memory for the matrix should be allocated, or null | |
517 for window-based redisplay where no glyph pools are used. The | |
518 member `pool' of the glyph matrix structure returned is set to | |
519 POOL, the structure is otherwise zeroed. */ | |
520 | |
521 struct glyph_matrix * | |
522 new_glyph_matrix (pool) | |
523 struct glyph_pool *pool; | |
524 { | |
525 struct glyph_matrix *result; | |
526 | |
527 /* Allocate and clear. */ | |
528 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
529 bzero (result, sizeof *result); | |
530 | |
531 /* Increment number of allocated matrices. This count is used | |
532 to detect memory leaks. */ | |
533 ++glyph_matrix_count; | |
534 | |
535 /* Set pool and return. */ | |
536 result->pool = pool; | |
537 return result; | |
538 } | |
539 | |
540 | |
541 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
542 | |
543 The global counter glyph_matrix_count is decremented when a matrix | |
544 is freed. If the count gets negative, more structures were freed | |
545 than allocated, i.e. one matrix was freed more than once or a bogus | |
546 pointer was passed to this function. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
547 |
25012 | 548 If MATRIX->pool is null, this means that the matrix manages its own |
549 glyph memory---this is done for matrices on X frames. Freeing the | |
550 matrix also frees the glyph memory in this case. */ | |
551 | |
552 static void | |
553 free_glyph_matrix (matrix) | |
554 struct glyph_matrix *matrix; | |
555 { | |
556 if (matrix) | |
557 { | |
558 int i; | |
559 | |
560 /* Detect the case that more matrices are freed than were | |
561 allocated. */ | |
562 if (--glyph_matrix_count < 0) | |
563 abort (); | |
564 | |
565 /* Free glyph memory if MATRIX owns it. */ | |
566 if (matrix->pool == NULL) | |
567 for (i = 0; i < matrix->rows_allocated; ++i) | |
568 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
569 |
25012 | 570 /* Free row structures and the matrix itself. */ |
571 xfree (matrix->rows); | |
572 xfree (matrix); | |
573 } | |
574 } | |
575 | |
576 | |
577 /* Return the number of glyphs to reserve for a marginal area of | |
578 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
579 display line of window W. MARGIN gives the width of the marginal | |
580 area in canonical character units. MARGIN should be an integer | |
581 or a float. */ | |
582 | |
583 static int | |
584 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
585 struct window *w; | |
586 int total_glyphs; | |
587 Lisp_Object margin; | |
588 { | |
589 int n; | |
590 | |
591 if (NUMBERP (margin)) | |
592 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
593 int width = XFASTINT (w->total_cols); |
25012 | 594 double d = max (0, XFLOATINT (margin)); |
595 d = min (width / 2 - 1, d); | |
57808
a1c4ff636947
(margin_glyphs_to_reserve): Don't use ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
56727
diff
changeset
|
596 n = (int) ((double) total_glyphs / width * d); |
25012 | 597 } |
598 else | |
599 n = 0; | |
600 | |
601 return n; | |
602 } | |
603 | |
604 | |
605 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
606 window sizes. | |
607 | |
608 W is null if the function is called for a frame glyph matrix. | |
609 Otherwise it is the window MATRIX is a member of. X and Y are the | |
610 indices of the first column and row of MATRIX within the frame | |
611 matrix, if such a matrix exists. They are zero for purely | |
612 window-based redisplay. DIM is the needed size of the matrix. | |
613 | |
614 In window-based redisplay, where no frame matrices exist, glyph | |
615 matrices manage their own glyph storage. Otherwise, they allocate | |
616 storage from a common frame glyph pool which can be found in | |
617 MATRIX->pool. | |
618 | |
619 The reason for this memory management strategy is to avoid complete | |
620 frame redraws if possible. When we allocate from a common pool, a | |
621 change of the location or size of a sub-matrix within the pool | |
622 requires a complete redisplay of the frame because we cannot easily | |
623 make sure that the current matrices of all windows still agree with | |
624 what is displayed on the screen. While this is usually fast, it | |
625 leads to screen flickering. */ | |
626 | |
627 static void | |
628 adjust_glyph_matrix (w, matrix, x, y, dim) | |
629 struct window *w; | |
630 struct glyph_matrix *matrix; | |
631 int x, y; | |
632 struct dim dim; | |
633 { | |
634 int i; | |
635 int new_rows; | |
636 int marginal_areas_changed_p = 0; | |
25546 | 637 int header_line_changed_p = 0; |
638 int header_line_p = 0; | |
25012 | 639 int left = -1, right = -1; |
80274
b818bce5757f
(adjust_glyph_matrix): Initialize window_height.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
640 int window_width = -1, window_height = -1; |
25012 | 641 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
642 /* See if W had a header line that has disappeared now, or vice versa. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
643 Get W's size. */ |
25012 | 644 if (w) |
645 { | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
646 window_box (w, -1, 0, 0, &window_width, &window_height); |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
647 |
25546 | 648 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
649 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 650 } |
25546 | 651 matrix->header_line_p = header_line_p; |
25012 | 652 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
653 /* If POOL is null, MATRIX is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
654 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
25012 | 655 haven't changed. This optimization is important because preserving |
656 the matrix means preventing redisplay. */ | |
657 if (matrix->pool == NULL) | |
658 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
659 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
660 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
25012 | 661 xassert (left >= 0 && right >= 0); |
662 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
663 || right != matrix->right_margin_glyphs); | |
664 | |
665 if (!marginal_areas_changed_p | |
666 && !fonts_changed_p | |
25546 | 667 && !header_line_changed_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
668 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
669 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
25012 | 670 && matrix->window_height == window_height |
671 && matrix->window_vscroll == w->vscroll | |
672 && matrix->window_width == window_width) | |
673 return; | |
674 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
675 |
25012 | 676 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
677 if (matrix->rows_allocated < dim.height) | |
678 { | |
679 int size = dim.height * sizeof (struct glyph_row); | |
680 new_rows = dim.height - matrix->rows_allocated; | |
681 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
682 bzero (matrix->rows + matrix->rows_allocated, | |
683 new_rows * sizeof *matrix->rows); | |
684 matrix->rows_allocated = dim.height; | |
685 } | |
686 else | |
687 new_rows = 0; | |
688 | |
689 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
690 on a frame not using window-based redisplay. Set up pointers for | |
691 each row into the glyph pool. */ | |
692 if (matrix->pool) | |
693 { | |
694 xassert (matrix->pool->glyphs); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
695 |
25012 | 696 if (w) |
697 { | |
698 left = margin_glyphs_to_reserve (w, dim.width, | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
699 w->left_margin_cols); |
25012 | 700 right = margin_glyphs_to_reserve (w, dim.width, |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
701 w->right_margin_cols); |
25012 | 702 } |
703 else | |
704 left = right = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
705 |
25012 | 706 for (i = 0; i < dim.height; ++i) |
707 { | |
708 struct glyph_row *row = &matrix->rows[i]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
709 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
710 row->glyphs[LEFT_MARGIN_AREA] |
25012 | 711 = (matrix->pool->glyphs |
712 + (y + i) * matrix->pool->ncolumns | |
713 + x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
714 |
25012 | 715 if (w == NULL |
716 || row == matrix->rows + dim.height - 1 | |
25546 | 717 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 718 { |
719 row->glyphs[TEXT_AREA] | |
720 = row->glyphs[LEFT_MARGIN_AREA]; | |
721 row->glyphs[RIGHT_MARGIN_AREA] | |
722 = row->glyphs[TEXT_AREA] + dim.width; | |
723 row->glyphs[LAST_AREA] | |
724 = row->glyphs[RIGHT_MARGIN_AREA]; | |
725 } | |
726 else | |
727 { | |
728 row->glyphs[TEXT_AREA] | |
729 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
730 row->glyphs[RIGHT_MARGIN_AREA] | |
731 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
732 row->glyphs[LAST_AREA] | |
733 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
734 } | |
735 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
736 |
25012 | 737 matrix->left_margin_glyphs = left; |
738 matrix->right_margin_glyphs = right; | |
739 } | |
740 else | |
741 { | |
742 /* If MATRIX->pool is null, MATRIX is responsible for managing | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
743 its own memory. It is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
744 Allocate glyph memory from the heap. */ |
25012 | 745 if (dim.width > matrix->matrix_w |
746 || new_rows | |
25546 | 747 || header_line_changed_p |
25012 | 748 || marginal_areas_changed_p) |
749 { | |
750 struct glyph_row *row = matrix->rows; | |
751 struct glyph_row *end = row + matrix->rows_allocated; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
752 |
25012 | 753 while (row < end) |
754 { | |
755 row->glyphs[LEFT_MARGIN_AREA] | |
756 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
757 (dim.width | |
758 * sizeof (struct glyph))); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
759 |
25012 | 760 /* The mode line never has marginal areas. */ |
761 if (row == matrix->rows + dim.height - 1 | |
25546 | 762 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 763 { |
764 row->glyphs[TEXT_AREA] | |
765 = row->glyphs[LEFT_MARGIN_AREA]; | |
766 row->glyphs[RIGHT_MARGIN_AREA] | |
767 = row->glyphs[TEXT_AREA] + dim.width; | |
768 row->glyphs[LAST_AREA] | |
769 = row->glyphs[RIGHT_MARGIN_AREA]; | |
770 } | |
771 else | |
772 { | |
773 row->glyphs[TEXT_AREA] | |
774 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
775 row->glyphs[RIGHT_MARGIN_AREA] | |
776 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
777 row->glyphs[LAST_AREA] | |
778 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
779 } | |
780 ++row; | |
781 } | |
782 } | |
783 | |
784 xassert (left >= 0 && right >= 0); | |
785 matrix->left_margin_glyphs = left; | |
786 matrix->right_margin_glyphs = right; | |
787 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
788 |
25012 | 789 /* Number of rows to be used by MATRIX. */ |
790 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
791 xassert (matrix->nrows >= 0); |
25012 | 792 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
793 if (w) |
25012 | 794 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
795 if (matrix == w->current_matrix) |
25012 | 796 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
797 /* Mark rows in a current matrix of a window as not having |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
798 valid contents. It's important to not do this for |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
799 desired matrices. When Emacs starts, it may already be |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
801 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
802 window_width = window_box_width (w, -1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
803 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
804 /* Optimize the case that only the height has changed (C-x 2, |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
805 upper window). Invalidate all rows that are no longer part |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
806 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
807 if (!marginal_areas_changed_p |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
808 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
809 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
810 && dim.width == matrix->matrix_w |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
811 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
812 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
813 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
814 { |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
815 /* Find the last row in the window. */ |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
816 for (i = 0; i < matrix->nrows && matrix->rows[i].enabled_p; ++i) |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
817 if (MATRIX_ROW_BOTTOM_Y (matrix->rows + i) >= window_height) |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
818 { |
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
819 ++i; |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
820 break; |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
821 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
822 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
823 /* Window end is invalid, if inside of the rows that |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
824 are invalidated below. */ |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
825 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
826 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
827 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
828 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
829 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
830 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
831 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
832 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
833 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
834 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
835 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
836 } |
25012 | 837 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
838 else if (matrix == w->desired_matrix) |
25012 | 839 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
840 /* Rows in desired matrices always have to be cleared; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
841 redisplay expects this is the case when it runs, so it |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
842 had better be the case when we adjust matrices between |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
843 redisplays. */ |
25012 | 844 for (i = 0; i < matrix->nrows; ++i) |
845 matrix->rows[i].enabled_p = 0; | |
846 } | |
847 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
848 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
849 |
25012 | 850 /* Remember last values to be able to optimize frame redraws. */ |
851 matrix->matrix_x = x; | |
852 matrix->matrix_y = y; | |
853 matrix->matrix_w = dim.width; | |
854 matrix->matrix_h = dim.height; | |
855 | |
856 /* Record the top y location and height of W at the time the matrix | |
857 was last adjusted. This is used to optimize redisplay above. */ | |
858 if (w) | |
859 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
860 matrix->window_left_col = WINDOW_LEFT_EDGE_COL (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
861 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
25012 | 862 matrix->window_height = window_height; |
863 matrix->window_width = window_width; | |
864 matrix->window_vscroll = w->vscroll; | |
865 } | |
866 } | |
867 | |
868 | |
869 /* Reverse the contents of rows in MATRIX between START and END. The | |
870 contents of the row at END - 1 end up at START, END - 2 at START + | |
871 1 etc. This is part of the implementation of rotate_matrix (see | |
872 below). */ | |
314 | 873 |
874 static void | |
25012 | 875 reverse_rows (matrix, start, end) |
876 struct glyph_matrix *matrix; | |
877 int start, end; | |
314 | 878 { |
25012 | 879 int i, j; |
880 | |
881 for (i = start, j = end - 1; i < j; ++i, --j) | |
882 { | |
883 /* Non-ISO HP/UX compiler doesn't like auto struct | |
884 initialization. */ | |
885 struct glyph_row temp; | |
886 temp = matrix->rows[i]; | |
887 matrix->rows[i] = matrix->rows[j]; | |
888 matrix->rows[j] = temp; | |
889 } | |
314 | 890 } |
891 | |
25012 | 892 |
893 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
894 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
895 indices. (Note: this does not copy glyphs, only glyph pointers in | |
896 row structures are moved around). | |
897 | |
898 The algorithm used for rotating the vector was, I believe, first | |
899 described by Kernighan. See the vector R as consisting of two | |
900 sub-vectors AB, where A has length BY for BY >= 0. The result | |
901 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
902 and reverse the result to get (ArBr)r which is BA. Similar for | |
903 rotating right. */ | |
904 | |
905 void | |
906 rotate_matrix (matrix, first, last, by) | |
907 struct glyph_matrix *matrix; | |
908 int first, last, by; | |
314 | 909 { |
25012 | 910 if (by < 0) |
911 { | |
912 /* Up (rotate left, i.e. towards lower indices). */ | |
913 by = -by; | |
914 reverse_rows (matrix, first, first + by); | |
915 reverse_rows (matrix, first + by, last); | |
916 reverse_rows (matrix, first, last); | |
917 } | |
918 else if (by > 0) | |
314 | 919 { |
25012 | 920 /* Down (rotate right, i.e. towards higher indices). */ |
921 reverse_rows (matrix, last - by, last); | |
922 reverse_rows (matrix, first, last - by); | |
923 reverse_rows (matrix, first, last); | |
314 | 924 } |
25012 | 925 } |
926 | |
927 | |
928 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
929 with indices START <= index < END. Increment positions by DELTA/ | |
930 DELTA_BYTES. */ | |
931 | |
932 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
933 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 934 struct glyph_matrix *matrix; |
935 int start, end, delta, delta_bytes; | |
936 { | |
937 /* Check that START and END are reasonable values. */ | |
938 xassert (start >= 0 && start <= matrix->nrows); | |
939 xassert (end >= 0 && end <= matrix->nrows); | |
940 xassert (start <= end); | |
941 | |
942 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
943 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 944 } |
945 | |
946 | |
947 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
948 the row indices of the first and last + 1 row to enable. If | |
949 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
950 | |
951 void | |
952 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
953 struct glyph_matrix *matrix; | |
954 int start, end; | |
955 int enabled_p; | |
956 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
957 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
958 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
959 xassert (end >= 0 && end <= matrix->nrows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
960 |
25012 | 961 for (; start < end; ++start) |
962 matrix->rows[start].enabled_p = enabled_p != 0; | |
963 } | |
964 | |
965 | |
966 /* Clear MATRIX. | |
967 | |
968 This empties all rows in MATRIX by setting the enabled_p flag for | |
969 all rows of the matrix to zero. The function prepare_desired_row | |
970 will eventually really clear a row when it sees one with a zero | |
971 enabled_p flag. | |
972 | |
973 Resets update hints to defaults value. The only update hint | |
974 currently present is the flag MATRIX->no_scrolling_p. */ | |
975 | |
976 void | |
977 clear_glyph_matrix (matrix) | |
978 struct glyph_matrix *matrix; | |
979 { | |
980 if (matrix) | |
314 | 981 { |
25012 | 982 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
983 matrix->no_scrolling_p = 0; | |
314 | 984 } |
985 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
986 |
25012 | 987 |
988 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
989 Increment y-positions in glyph rows between START and END by DY, | |
990 and recompute their visible height. */ | |
991 | |
992 void | |
993 shift_glyph_matrix (w, matrix, start, end, dy) | |
994 struct window *w; | |
995 struct glyph_matrix *matrix; | |
996 int start, end, dy; | |
997 { | |
998 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
999 |
25012 | 1000 xassert (start <= end); |
1001 xassert (start >= 0 && start < matrix->nrows); | |
1002 xassert (end >= 0 && end <= matrix->nrows); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1003 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1004 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1005 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1006 |
25012 | 1007 for (; start < end; ++start) |
1008 { | |
1009 struct glyph_row *row = &matrix->rows[start]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1010 |
25012 | 1011 row->y += dy; |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1012 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1013 |
25012 | 1014 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1015 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1016 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1017 row->visible_height -= row->y + row->height - max_y; |
25012 | 1018 } |
1019 } | |
1020 | |
1021 | |
1022 /* Mark all rows in current matrices of frame F as invalid. Marking | |
1023 invalid is done by setting enabled_p to zero for all rows in a | |
1024 current matrix. */ | |
1025 | |
1026 void | |
1027 clear_current_matrices (f) | |
1028 register struct frame *f; | |
1029 { | |
1030 /* Clear frame current matrix, if we have one. */ | |
1031 if (f->current_matrix) | |
1032 clear_glyph_matrix (f->current_matrix); | |
1033 | |
1034 /* Clear the matrix of the menu bar window, if such a window exists. | |
1035 The menu bar window is currently used to display menus on X when | |
1036 no toolkit support is compiled in. */ | |
1037 if (WINDOWP (f->menu_bar_window)) | |
1038 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1039 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1040 /* Clear the matrix of the tool-bar window, if any. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1041 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1042 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1043 |
1044 /* Clear current window matrices. */ | |
1045 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1046 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1047 } | |
1048 | |
1049 | |
1050 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1051 |
21514 | 1052 void |
25012 | 1053 clear_desired_matrices (f) |
1054 register struct frame *f; | |
314 | 1055 { |
25012 | 1056 if (f->desired_matrix) |
1057 clear_glyph_matrix (f->desired_matrix); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1058 |
25012 | 1059 if (WINDOWP (f->menu_bar_window)) |
1060 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1061 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1062 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1063 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1064 |
1065 /* Do it for window matrices. */ | |
1066 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1067 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1068 } | |
1069 | |
1070 | |
1071 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1072 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1073 | |
1074 static void | |
1075 clear_window_matrices (w, desired_p) | |
1076 struct window *w; | |
1077 int desired_p; | |
1078 { | |
1079 while (w) | |
314 | 1080 { |
25012 | 1081 if (!NILP (w->hchild)) |
1082 { | |
1083 xassert (WINDOWP (w->hchild)); | |
1084 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1085 } | |
1086 else if (!NILP (w->vchild)) | |
314 | 1087 { |
25012 | 1088 xassert (WINDOWP (w->vchild)); |
1089 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1090 } | |
1091 else | |
1092 { | |
1093 if (desired_p) | |
1094 clear_glyph_matrix (w->desired_matrix); | |
1095 else | |
314 | 1096 { |
25012 | 1097 clear_glyph_matrix (w->current_matrix); |
1098 w->window_end_valid = Qnil; | |
314 | 1099 } |
25012 | 1100 } |
1101 | |
1102 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1103 } | |
1104 } | |
1105 | |
1106 | |
1107 | |
1108 /*********************************************************************** | |
1109 Glyph Rows | |
1110 | |
1111 See dispextern.h for an overall explanation of glyph rows. | |
1112 ***********************************************************************/ | |
1113 | |
1114 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1115 changes in the glyph_row structure, i.e. addition or removal of | |
1116 structure members. */ | |
1117 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1118 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1119 |
25012 | 1120 void |
1121 clear_glyph_row (row) | |
1122 struct glyph_row *row; | |
1123 { | |
1124 struct glyph *p[1 + LAST_AREA]; | |
1125 | |
1126 /* Save pointers. */ | |
1127 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1128 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1129 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1130 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1131 | |
1132 /* Clear. */ | |
1133 *row = null_row; | |
1134 | |
1135 /* Restore pointers. */ | |
1136 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1137 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1138 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1139 row->glyphs[LAST_AREA] = p[LAST_AREA]; | |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1140 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1141 #if 0 /* At some point, some bit-fields of struct glyph were not set, |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1142 which made glyphs unequal when compared with GLYPH_EQUAL_P. |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1143 Redisplay outputs such glyphs, and flickering effects were |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1144 the result. This also depended on the contents of memory |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1145 returned by xmalloc. If flickering happens again, activate |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1146 the code below. If the flickering is gone with that, chances |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1147 are that the flickering has the same reason as here. */ |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1148 bzero (p[0], (char *) p[LAST_AREA] - (char *) p[0]); |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1149 #endif |
25012 | 1150 } |
1151 | |
1152 | |
1153 /* Make ROW an empty, enabled row of canonical character height, | |
1154 in window W starting at y-position Y. */ | |
1155 | |
1156 void | |
1157 blank_row (w, row, y) | |
1158 struct window *w; | |
1159 struct glyph_row *row; | |
1160 int y; | |
1161 { | |
1162 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1163 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1164 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1165 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1166 |
25012 | 1167 clear_glyph_row (row); |
1168 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1169 row->ascent = row->phys_ascent = 0; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1170 row->height = row->phys_height = FRAME_LINE_HEIGHT (XFRAME (w->frame)); |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1171 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1172 |
25012 | 1173 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1174 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1175 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1176 row->visible_height -= row->y + row->height - max_y; |
25012 | 1177 |
1178 row->enabled_p = 1; | |
1179 } | |
1180 | |
1181 | |
1182 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1183 are the amounts by which to change positions. Note that the first | |
1184 glyph of the text area of a row can have a buffer position even if | |
1185 the used count of the text area is zero. Such rows display line | |
1186 ends. */ | |
1187 | |
1188 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1189 increment_row_positions (row, delta, delta_bytes) |
25012 | 1190 struct glyph_row *row; |
1191 int delta, delta_bytes; | |
1192 { | |
1193 int area, i; | |
1194 | |
1195 /* Increment start and end positions. */ | |
1196 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1197 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1198 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1199 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1200 | |
65003
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1201 if (!row->enabled_p) |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1202 return; |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1203 |
25012 | 1204 /* Increment positions in glyphs. */ |
1205 for (area = 0; area < LAST_AREA; ++area) | |
1206 for (i = 0; i < row->used[area]; ++i) | |
1207 if (BUFFERP (row->glyphs[area][i].object) | |
1208 && row->glyphs[area][i].charpos > 0) | |
1209 row->glyphs[area][i].charpos += delta; | |
1210 | |
1211 /* Capture the case of rows displaying a line end. */ | |
1212 if (row->used[TEXT_AREA] == 0 | |
1213 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1214 row->glyphs[TEXT_AREA]->charpos += delta; | |
1215 } | |
1216 | |
1217 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1218 #if 0 |
25012 | 1219 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1220 contents, i.e. glyph structure contents are exchanged between A and | |
1221 B without changing glyph pointers in A and B. */ | |
1222 | |
1223 static void | |
1224 swap_glyphs_in_rows (a, b) | |
1225 struct glyph_row *a, *b; | |
1226 { | |
1227 int area; | |
1228 | |
1229 for (area = 0; area < LAST_AREA; ++area) | |
1230 { | |
1231 /* Number of glyphs to swap. */ | |
1232 int max_used = max (a->used[area], b->used[area]); | |
1233 | |
1234 /* Start of glyphs in area of row A. */ | |
1235 struct glyph *glyph_a = a->glyphs[area]; | |
1236 | |
1237 /* End + 1 of glyphs in area of row A. */ | |
1238 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1239 | |
1240 /* Start of glyphs in area of row B. */ | |
1241 struct glyph *glyph_b = b->glyphs[area]; | |
1242 | |
1243 while (glyph_a < glyph_a_end) | |
1244 { | |
1245 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1246 initialization. */ | |
1247 struct glyph temp; | |
1248 temp = *glyph_a; | |
1249 *glyph_a = *glyph_b; | |
1250 *glyph_b = temp; | |
1251 ++glyph_a; | |
1252 ++glyph_b; | |
314 | 1253 } |
1254 } | |
1255 } | |
25012 | 1256 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1257 #endif /* 0 */ |
25012 | 1258 |
1259 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1260 | |
1261 static INLINE void | |
1262 swap_glyph_pointers (a, b) | |
1263 struct glyph_row *a, *b; | |
1264 { | |
1265 int i; | |
1266 for (i = 0; i < LAST_AREA + 1; ++i) | |
1267 { | |
1268 struct glyph *temp = a->glyphs[i]; | |
1269 a->glyphs[i] = b->glyphs[i]; | |
1270 b->glyphs[i] = temp; | |
1271 } | |
1272 } | |
1273 | |
1274 | |
1275 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1276 that glyph pointers in the structures are left unchanged. */ | |
1277 | |
1278 INLINE void | |
1279 copy_row_except_pointers (to, from) | |
1280 struct glyph_row *to, *from; | |
1281 { | |
1282 struct glyph *pointers[1 + LAST_AREA]; | |
1283 | |
1284 /* Save glyph pointers of TO. */ | |
1285 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1286 | |
1287 /* Do a structure assignment. */ | |
1288 *to = *from; | |
1289 | |
1290 /* Restore original pointers of TO. */ | |
1291 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1292 } | |
1293 | |
1294 | |
1295 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1296 TO and FROM are left unchanged. Glyph contents are copied from the | |
1297 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1298 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1299 | |
1300 void | |
1301 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1302 struct glyph_row *to, *from; | |
1303 int delta, delta_bytes; | |
1304 { | |
1305 int area; | |
1306 | |
1307 /* This is like a structure assignment TO = FROM, except that | |
1308 glyph pointers in the rows are left unchanged. */ | |
1309 copy_row_except_pointers (to, from); | |
1310 | |
1311 /* Copy glyphs from FROM to TO. */ | |
1312 for (area = 0; area < LAST_AREA; ++area) | |
1313 if (from->used[area]) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1314 bcopy (from->glyphs[area], to->glyphs[area], |
25012 | 1315 from->used[area] * sizeof (struct glyph)); |
1316 | |
1317 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1318 increment_row_positions (to, delta, delta_bytes); |
25012 | 1319 } |
1320 | |
1321 | |
1322 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1323 assignment TO = FROM, except that glyph pointers are not copied but | |
1324 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1325 a memory leak. */ | |
1326 | |
1327 static INLINE void | |
1328 assign_row (to, from) | |
1329 struct glyph_row *to, *from; | |
1330 { | |
1331 swap_glyph_pointers (to, from); | |
1332 copy_row_except_pointers (to, from); | |
1333 } | |
1334 | |
1335 | |
1336 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1337 a row in a window matrix, is a slice of the glyph memory of the | |
1338 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1339 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1340 memory of FRAME_ROW. */ | |
1341 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1342 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1343 |
25012 | 1344 static int |
1345 glyph_row_slice_p (window_row, frame_row) | |
1346 struct glyph_row *window_row, *frame_row; | |
1347 { | |
1348 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1349 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1350 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1351 | |
1352 return (frame_glyph_start <= window_glyph_start | |
1353 && window_glyph_start < frame_glyph_end); | |
1354 } | |
1355 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1356 #endif /* GLYPH_DEBUG */ |
25012 | 1357 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1358 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1359 |
25012 | 1360 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1361 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1362 in WINDOW_MATRIX is found satisfying the condition. */ | |
1363 | |
1364 static struct glyph_row * | |
1365 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1366 struct glyph_matrix *window_matrix, *frame_matrix; | |
1367 int row; | |
1368 { | |
1369 int i; | |
1370 | |
1371 xassert (row >= 0 && row < frame_matrix->nrows); | |
1372 | |
1373 for (i = 0; i < window_matrix->nrows; ++i) | |
1374 if (glyph_row_slice_p (window_matrix->rows + i, | |
1375 frame_matrix->rows + row)) | |
1376 break; | |
1377 | |
1378 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1379 } | |
1380 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1381 #endif /* 0 */ |
25012 | 1382 |
1383 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1384 i.e. they are only marked as to be cleared by setting their | |
1385 enabled_p flag to zero. When a row is to be displayed, a prior | |
1386 call to this function really clears it. */ | |
1387 | |
1388 void | |
1389 prepare_desired_row (row) | |
1390 struct glyph_row *row; | |
1391 { | |
1392 if (!row->enabled_p) | |
1393 { | |
1394 clear_glyph_row (row); | |
1395 row->enabled_p = 1; | |
1396 } | |
1397 } | |
1398 | |
1399 | |
1400 /* Return a hash code for glyph row ROW. */ | |
1401 | |
1402 int | |
1403 line_hash_code (row) | |
1404 struct glyph_row *row; | |
1405 { | |
1406 int hash = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1407 |
25012 | 1408 if (row->enabled_p) |
1409 { | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1410 struct glyph *glyph = row->glyphs[TEXT_AREA]; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1411 struct glyph *end = glyph + row->used[TEXT_AREA]; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1412 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1413 while (glyph < end) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1414 { |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1415 int c = glyph->u.ch; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1416 int face_id = glyph->face_id; |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
1417 if (FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1418 c -= SPACEGLYPH; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1419 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1420 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1421 ++glyph; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1422 } |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1423 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1424 if (hash == 0) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1425 hash = 1; |
25012 | 1426 } |
1427 | |
1428 return hash; | |
1429 } | |
1430 | |
1431 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1432 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
25012 | 1433 the number of characters in the line. If must_write_spaces is |
1434 zero, leading and trailing spaces are ignored. */ | |
1435 | |
1436 static unsigned int | |
1437 line_draw_cost (matrix, vpos) | |
1438 struct glyph_matrix *matrix; | |
1439 int vpos; | |
1440 { | |
1441 struct glyph_row *row = matrix->rows + vpos; | |
1442 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1443 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1444 int len; | |
1445 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1446 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1447 | |
1448 /* Ignore trailing and leading spaces if we can. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
1449 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
25012 | 1450 { |
1451 /* Skip from the end over trailing spaces. */ | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
1452 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1453 --end; |
1454 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1455 /* All blank line. */ |
25012 | 1456 if (end == beg) |
1457 return 0; | |
1458 | |
1459 /* Skip over leading spaces. */ | |
1460 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1461 ++beg; | |
1462 } | |
1463 | |
1464 /* If we don't have a glyph-table, each glyph is one character, | |
1465 so return the number of glyphs. */ | |
1466 if (glyph_table_base == 0) | |
1467 len = end - beg; | |
1468 else | |
1469 { | |
1470 /* Otherwise, scan the glyphs and accumulate their total length | |
1471 in LEN. */ | |
1472 len = 0; | |
1473 while (beg < end) | |
1474 { | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1475 GLYPH g; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1476 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1477 SET_GLYPH_FROM_CHAR_GLYPH (g, *beg); |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1478 |
92387
41d029d73eac
(line_draw_cost): Fix invalid glyph check.
Kim F. Storm <storm@cua.dk>
parents:
92276
diff
changeset
|
1479 if (GLYPH_INVALID_P (g) |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1480 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1481 len += 1; |
1482 else | |
1483 len += GLYPH_LENGTH (glyph_table_base, g); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1484 |
25012 | 1485 ++beg; |
1486 } | |
1487 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1488 |
25012 | 1489 return len; |
1490 } | |
1491 | |
1492 | |
1493 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1494 and B have equal contents. W is the window to which the glyphs | |
1495 rows A and B belong. It is needed here to test for partial row | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1496 visibility. MOUSE_FACE_P non-zero means compare the mouse_face_p |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1497 flags of A and B, too. */ |
25012 | 1498 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1499 static INLINE int |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1500 row_equal_p (w, a, b, mouse_face_p) |
25012 | 1501 struct window *w; |
1502 struct glyph_row *a, *b; | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1503 int mouse_face_p; |
25012 | 1504 { |
1505 if (a == b) | |
1506 return 1; | |
1507 else if (a->hash != b->hash) | |
1508 return 0; | |
1509 else | |
1510 { | |
1511 struct glyph *a_glyph, *b_glyph, *a_end; | |
1512 int area; | |
1513 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1514 if (mouse_face_p && a->mouse_face_p != b->mouse_face_p) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1515 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1516 |
25012 | 1517 /* Compare glyphs. */ |
1518 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1519 { | |
1520 if (a->used[area] != b->used[area]) | |
1521 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1522 |
25012 | 1523 a_glyph = a->glyphs[area]; |
1524 a_end = a_glyph + a->used[area]; | |
1525 b_glyph = b->glyphs[area]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1526 |
25012 | 1527 while (a_glyph < a_end |
1528 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1529 ++a_glyph, ++b_glyph; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1530 |
25012 | 1531 if (a_glyph != a_end) |
1532 return 0; | |
1533 } | |
1534 | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1535 if (a->fill_line_p != b->fill_line_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1536 || a->cursor_in_fringe_p != b->cursor_in_fringe_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1537 || a->left_fringe_bitmap != b->left_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1538 || a->left_fringe_face_id != b->left_fringe_face_id |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1539 || a->right_fringe_bitmap != b->right_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1540 || a->right_fringe_face_id != b->right_fringe_face_id |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
1541 || a->overlay_arrow_bitmap != b->overlay_arrow_bitmap |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1542 || a->exact_window_width_line_p != b->exact_window_width_line_p |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1543 || a->overlapped_p != b->overlapped_p |
25012 | 1544 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1545 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1546 /* Different partially visible characters on left margin. */ | |
1547 || a->x != b->x | |
1548 /* Different height. */ | |
1549 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1550 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1551 || a->phys_height != b->phys_height |
25012 | 1552 || a->visible_height != b->visible_height) |
1553 return 0; | |
1554 } | |
1555 | |
1556 return 1; | |
1557 } | |
1558 | |
1559 | |
314 | 1560 |
25012 | 1561 /*********************************************************************** |
1562 Glyph Pool | |
1563 | |
1564 See dispextern.h for an overall explanation of glyph pools. | |
1565 ***********************************************************************/ | |
1566 | |
1567 /* Allocate a glyph_pool structure. The structure returned is | |
1568 initialized with zeros. The global variable glyph_pool_count is | |
1569 incremented for each pool allocated. */ | |
1570 | |
1571 static struct glyph_pool * | |
1572 new_glyph_pool () | |
1573 { | |
1574 struct glyph_pool *result; | |
1575 | |
1576 /* Allocate a new glyph_pool and clear it. */ | |
1577 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1578 bzero (result, sizeof *result); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1579 |
25012 | 1580 /* For memory leak and double deletion checking. */ |
1581 ++glyph_pool_count; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1582 |
25012 | 1583 return result; |
1584 } | |
1585 | |
1586 | |
1587 /* Free a glyph_pool structure POOL. The function may be called with | |
1588 a null POOL pointer. The global variable glyph_pool_count is | |
1589 decremented with every pool structure freed. If this count gets | |
1590 negative, more structures were freed than allocated, i.e. one | |
1591 structure must have been freed more than once or a bogus pointer | |
1592 was passed to free_glyph_pool. */ | |
1593 | |
1594 static void | |
1595 free_glyph_pool (pool) | |
1596 struct glyph_pool *pool; | |
1597 { | |
1598 if (pool) | |
1599 { | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1600 /* More freed than allocated? */ |
25012 | 1601 --glyph_pool_count; |
1602 xassert (glyph_pool_count >= 0); | |
1603 | |
1604 xfree (pool->glyphs); | |
1605 xfree (pool); | |
1606 } | |
1607 } | |
1608 | |
1609 | |
1610 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1611 columns we need. This function never shrinks a pool. The only | |
1612 case in which this would make sense, would be when a frame's size | |
1613 is changed from a large value to a smaller one. But, if someone | |
1614 does it once, we can expect that he will do it again. | |
1615 | |
1616 Value is non-zero if the pool changed in a way which makes | |
1617 re-adjusting window glyph matrices necessary. */ | |
1618 | |
1619 static int | |
1620 realloc_glyph_pool (pool, matrix_dim) | |
1621 struct glyph_pool *pool; | |
1622 struct dim matrix_dim; | |
1623 { | |
1624 int needed; | |
1625 int changed_p; | |
1626 | |
1627 changed_p = (pool->glyphs == 0 | |
1628 || matrix_dim.height != pool->nrows | |
1629 || matrix_dim.width != pool->ncolumns); | |
1630 | |
1631 /* Enlarge the glyph pool. */ | |
1632 needed = matrix_dim.width * matrix_dim.height; | |
1633 if (needed > pool->nglyphs) | |
1634 { | |
1635 int size = needed * sizeof (struct glyph); | |
1636 | |
1637 if (pool->glyphs) | |
1638 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1639 else | |
1640 { | |
1641 pool->glyphs = (struct glyph *) xmalloc (size); | |
1642 bzero (pool->glyphs, size); | |
1643 } | |
1644 | |
1645 pool->nglyphs = needed; | |
1646 } | |
1647 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1648 /* Remember the number of rows and columns because (a) we use them |
25012 | 1649 to do sanity checks, and (b) the number of columns determines |
1650 where rows in the frame matrix start---this must be available to | |
1651 determine pointers to rows of window sub-matrices. */ | |
1652 pool->nrows = matrix_dim.height; | |
1653 pool->ncolumns = matrix_dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1654 |
25012 | 1655 return changed_p; |
1656 } | |
1657 | |
1658 | |
1659 | |
1660 /*********************************************************************** | |
1661 Debug Code | |
1662 ***********************************************************************/ | |
1663 | |
1664 #if GLYPH_DEBUG | |
1665 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1666 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1667 /* Flush standard output. This is sometimes useful to call from the debugger. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1668 XXX Maybe this should be changed to flush the current terminal instead of |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1669 stdout. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1670 */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1671 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1672 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1673 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1674 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1675 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1676 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1677 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1678 |
25012 | 1679 /* Check that no glyph pointers have been lost in MATRIX. If a |
1680 pointer has been lost, e.g. by using a structure assignment between | |
1681 rows, at least one pointer must occur more than once in the rows of | |
1682 MATRIX. */ | |
1683 | |
1684 void | |
1685 check_matrix_pointer_lossage (matrix) | |
1686 struct glyph_matrix *matrix; | |
1687 { | |
1688 int i, j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1689 |
25012 | 1690 for (i = 0; i < matrix->nrows; ++i) |
1691 for (j = 0; j < matrix->nrows; ++j) | |
1692 xassert (i == j | |
1693 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1694 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1695 } | |
1696 | |
1697 | |
1698 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1699 | |
1700 struct glyph_row * | |
1701 matrix_row (matrix, row) | |
1702 struct glyph_matrix *matrix; | |
1703 int row; | |
1704 { | |
1705 xassert (matrix && matrix->rows); | |
1706 xassert (row >= 0 && row < matrix->nrows); | |
1707 | |
1708 /* That's really too slow for normal testing because this function | |
1709 is called almost everywhere. Although---it's still astonishingly | |
1710 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1711 #if 0 |
25012 | 1712 check_matrix_pointer_lossage (matrix); |
1713 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1714 |
25012 | 1715 return matrix->rows + row; |
1716 } | |
1717 | |
1718 | |
1719 #if 0 /* This function makes invalid assumptions when text is | |
1720 partially invisible. But it might come handy for debugging | |
1721 nevertheless. */ | |
1722 | |
1723 /* Check invariants that must hold for an up to date current matrix of | |
1724 window W. */ | |
1725 | |
1726 static void | |
1727 check_matrix_invariants (w) | |
314 | 1728 struct window *w; |
1729 { | |
25012 | 1730 struct glyph_matrix *matrix = w->current_matrix; |
1731 int yb = window_text_bottom_y (w); | |
1732 struct glyph_row *row = matrix->rows; | |
1733 struct glyph_row *last_text_row = NULL; | |
1734 struct buffer *saved = current_buffer; | |
1735 struct buffer *buffer = XBUFFER (w->buffer); | |
1736 int c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1737 |
25012 | 1738 /* This can sometimes happen for a fresh window. */ |
1739 if (matrix->nrows < 2) | |
1740 return; | |
1741 | |
1742 set_buffer_temp (buffer); | |
1743 | |
1744 /* Note: last row is always reserved for the mode line. */ | |
1745 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1746 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1747 { | |
1748 struct glyph_row *next = row + 1; | |
1749 | |
1750 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1751 last_text_row = row; | |
1752 | |
1753 /* Check that character and byte positions are in sync. */ | |
1754 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1755 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1756 | |
1757 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1758 have such a position temporarily in case of a minibuffer | |
1759 displaying something like `[Sole completion]' at its end. */ | |
1760 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1761 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1762 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1763 | |
1764 /* Check that end position of `row' is equal to start position | |
1765 of next row. */ | |
1766 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1767 { | |
1768 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1769 == MATRIX_ROW_START_CHARPOS (next)); | |
1770 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1771 == MATRIX_ROW_START_BYTEPOS (next)); | |
1772 } | |
1773 row = next; | |
1774 } | |
1775 | |
1776 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1777 xassert (w->desired_matrix->rows != NULL); | |
1778 set_buffer_temp (saved); | |
1779 } | |
1780 | |
1781 #endif /* 0 */ | |
1782 | |
1783 #endif /* GLYPH_DEBUG != 0 */ | |
1784 | |
1785 | |
1786 | |
1787 /********************************************************************** | |
1788 Allocating/ Adjusting Glyph Matrices | |
1789 **********************************************************************/ | |
1790 | |
1791 /* Allocate glyph matrices over a window tree for a frame-based | |
1792 redisplay | |
1793 | |
1794 X and Y are column/row within the frame glyph matrix where | |
1795 sub-matrices for the window tree rooted at WINDOW must be | |
73383
015a870c0c9a
(adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73318
diff
changeset
|
1796 allocated. DIM_ONLY_P non-zero means that the caller of this |
015a870c0c9a
(adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73318
diff
changeset
|
1797 function is only interested in the result matrix dimension, and |
015a870c0c9a
(adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73318
diff
changeset
|
1798 matrix adjustments should not be performed. |
25012 | 1799 |
1800 The function returns the total width/height of the sub-matrices of | |
1801 the window tree. If called on a frame root window, the computation | |
1802 will take the mini-buffer window into account. | |
1803 | |
1804 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1805 | |
1806 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1807 glyph matrices yet, and | |
1808 | |
1809 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1810 any window in the tree will be changed or have been changed (see | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1811 DIM_ONLY_P) |
25012 | 1812 |
1813 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1814 function. | |
1815 | |
1816 Windows are arranged into chains of windows on the same level | |
1817 through the next fields of window structures. Such a level can be | |
1818 either a sequence of horizontally adjacent windows from left to | |
1819 right, or a sequence of vertically adjacent windows from top to | |
1820 bottom. Each window in a horizontal sequence can be either a leaf | |
1821 window or a vertical sequence; a window in a vertical sequence can | |
1822 be either a leaf or a horizontal sequence. All windows in a | |
1823 horizontal sequence have the same height, and all windows in a | |
1824 vertical sequence have the same width. | |
1825 | |
1826 This function uses, for historical reasons, a more general | |
1827 algorithm to determine glyph matrix dimensions that would be | |
1828 necessary. | |
1829 | |
1830 The matrix height of a horizontal sequence is determined by the | |
1831 maximum height of any matrix in the sequence. The matrix width of | |
1832 a horizontal sequence is computed by adding up matrix widths of | |
1833 windows in the sequence. | |
1834 | |
1835 |<------- result width ------->| | |
1836 +---------+----------+---------+ --- | |
1837 | | | | | | |
1838 | | | | | |
1839 +---------+ | | result height | |
1840 | +---------+ | |
1841 | | | | |
1842 +----------+ --- | |
1843 | |
1844 The matrix width of a vertical sequence is the maximum matrix width | |
1845 of any window in the sequence. Its height is computed by adding up | |
1846 matrix heights of windows in the sequence. | |
1847 | |
1848 |<---- result width -->| | |
1849 +---------+ --- | |
1850 | | | | |
1851 | | | | |
1852 +---------+--+ | | |
1853 | | | | |
1854 | | result height | |
1855 | | | |
1856 +------------+---------+ | | |
1857 | | | | |
1858 | | | | |
1859 +------------+---------+ --- */ | |
1860 | |
1861 /* Bit indicating that a new matrix will be allocated or has been | |
1862 allocated. */ | |
1863 | |
1864 #define NEW_LEAF_MATRIX (1 << 0) | |
1865 | |
1866 /* Bit indicating that a matrix will or has changed its location or | |
1867 size. */ | |
1868 | |
1869 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1870 | |
1871 static struct dim | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1872 allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1873 window_change_flags) |
25012 | 1874 Lisp_Object window; |
1875 int x, y; | |
1876 int dim_only_p; | |
1877 int *window_change_flags; | |
1878 { | |
1879 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1880 int x0 = x, y0 = y; | |
1881 int wmax = 0, hmax = 0; | |
1882 struct dim total; | |
1883 struct dim dim; | |
1884 struct window *w; | |
1885 int in_horz_combination_p; | |
1886 | |
1887 /* What combination is WINDOW part of? Compute this once since the | |
1888 result is the same for all windows in the `next' chain. The | |
1889 special case of a root window (parent equal to nil) is treated | |
1890 like a vertical combination because a root window's `next' | |
1891 points to the mini-buffer window, if any, which is arranged | |
1892 vertically below other windows. */ | |
1893 in_horz_combination_p | |
1894 = (!NILP (XWINDOW (window)->parent) | |
1895 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1896 | |
1897 /* For WINDOW and all windows on the same level. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1898 do |
25012 | 1899 { |
1900 w = XWINDOW (window); | |
1901 | |
1902 /* Get the dimension of the window sub-matrix for W, depending | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1903 on whether this is a combination or a leaf window. */ |
25012 | 1904 if (!NILP (w->hchild)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1905 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
25012 | 1906 dim_only_p, |
1907 window_change_flags); | |
1908 else if (!NILP (w->vchild)) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1909 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
25012 | 1910 dim_only_p, |
1911 window_change_flags); | |
1912 else | |
1913 { | |
1914 /* If not already done, allocate sub-matrix structures. */ | |
1915 if (w->desired_matrix == NULL) | |
1916 { | |
1917 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1918 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1919 *window_change_flags |= NEW_LEAF_MATRIX; | |
1920 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1921 |
25012 | 1922 /* Width and height MUST be chosen so that there are no |
1923 holes in the frame matrix. */ | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1924 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1925 dim.height = required_matrix_height (w); |
25012 | 1926 |
1927 /* Will matrix be re-allocated? */ | |
1928 if (x != w->desired_matrix->matrix_x | |
1929 || y != w->desired_matrix->matrix_y | |
1930 || dim.width != w->desired_matrix->matrix_w | |
1931 || dim.height != w->desired_matrix->matrix_h | |
1932 || (margin_glyphs_to_reserve (w, dim.width, | |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
1933 w->left_margin_cols) |
25012 | 1934 != w->desired_matrix->left_margin_glyphs) |
1935 || (margin_glyphs_to_reserve (w, dim.width, | |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
1936 w->right_margin_cols) |
25012 | 1937 != w->desired_matrix->right_margin_glyphs)) |
1938 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1939 | |
1940 /* Actually change matrices, if allowed. Do not consider | |
1941 CHANGED_LEAF_MATRIX computed above here because the pool | |
1942 may have been changed which we don't now here. We trust | |
1943 that we only will be called with DIM_ONLY_P != 0 when | |
1944 necessary. */ | |
1945 if (!dim_only_p) | |
1946 { | |
1947 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1948 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1949 } | |
1950 } | |
1951 | |
1952 /* If we are part of a horizontal combination, advance x for | |
1953 windows to the right of W; otherwise advance y for windows | |
1954 below W. */ | |
1955 if (in_horz_combination_p) | |
1956 x += dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1957 else |
25012 | 1958 y += dim.height; |
1959 | |
1960 /* Remember maximum glyph matrix dimensions. */ | |
1961 wmax = max (wmax, dim.width); | |
1962 hmax = max (hmax, dim.height); | |
1963 | |
1964 /* Next window on same level. */ | |
1965 window = w->next; | |
1966 } | |
1967 while (!NILP (window)); | |
1968 | |
1969 /* Set `total' to the total glyph matrix dimension of this window | |
1970 level. In a vertical combination, the width is the width of the | |
1971 widest window; the height is the y we finally reached, corrected | |
1972 by the y we started with. In a horizontal combination, the total | |
1973 height is the height of the tallest window, and the width is the | |
1974 x we finally reached, corrected by the x we started with. */ | |
1975 if (in_horz_combination_p) | |
1976 { | |
1977 total.width = x - x0; | |
1978 total.height = hmax; | |
1979 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1980 else |
25012 | 1981 { |
1982 total.width = wmax; | |
1983 total.height = y - y0; | |
1984 } | |
1985 | |
1986 return total; | |
1987 } | |
1988 | |
1989 | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 /* Return the required height of glyph matrices for window W. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1991 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1992 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1993 required_matrix_height (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1994 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1995 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1996 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1997 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1998 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1999 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2000 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2001 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
85252 | 2002 int window_pixel_height = window_box_height (w) + eabs (w->vscroll); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2003 return (((window_pixel_height + ch_height - 1) |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
2004 / ch_height) * w->nrows_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2005 /* One partially visible line at the top and |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 bottom of the window. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2007 + 2 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
2008 /* 2 for header and mode line. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2009 + 2); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2010 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2011 #endif /* HAVE_WINDOW_SYSTEM */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2012 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2013 return WINDOW_TOTAL_LINES (w); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2014 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2015 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2016 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2017 /* Return the required width of glyph matrices for window W. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2018 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2019 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2020 required_matrix_width (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2021 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2022 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2023 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2024 struct frame *f = XFRAME (w->frame); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2025 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2026 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2027 int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2028 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2029 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2030 /* Compute number of glyphs needed in a glyph row. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2031 return (((window_pixel_width + ch_width - 1) |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
2032 / ch_width) * w->ncols_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2033 /* 2 partially visible columns in the text area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2034 + 2 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2035 /* One partially visible column at the right |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2036 edge of each marginal area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2037 + 1 + 1); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2038 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2039 #endif /* HAVE_WINDOW_SYSTEM */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2040 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2041 return XINT (w->total_cols); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2042 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2043 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2044 |
25012 | 2045 /* Allocate window matrices for window-based redisplay. W is the |
73383
015a870c0c9a
(adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73318
diff
changeset
|
2046 window whose matrices must be allocated/reallocated. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2047 |
25012 | 2048 static void |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2049 allocate_matrices_for_window_redisplay (w) |
25012 | 2050 struct window *w; |
2051 { | |
2052 while (w) | |
314 | 2053 { |
25012 | 2054 if (!NILP (w->vchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2055 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
25012 | 2056 else if (!NILP (w->hchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2057 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
25012 | 2058 else |
314 | 2059 { |
25012 | 2060 /* W is a leaf window. */ |
2061 struct dim dim; | |
2062 | |
2063 /* If matrices are not yet allocated, allocate them now. */ | |
2064 if (w->desired_matrix == NULL) | |
314 | 2065 { |
25012 | 2066 w->desired_matrix = new_glyph_matrix (NULL); |
2067 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 2068 } |
25012 | 2069 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2070 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2071 dim.height = required_matrix_height (w); |
25012 | 2072 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
2073 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2074 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2075 |
25012 | 2076 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
2077 } | |
2078 } | |
2079 | |
2080 | |
2081 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2082 do it for all frames; otherwise do it just for the given frame. | |
2083 This function must be called when a new frame is created, its size | |
2084 changes, or its window configuration changes. */ | |
2085 | |
2086 void | |
2087 adjust_glyphs (f) | |
2088 struct frame *f; | |
2089 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2090 /* Block input so that expose events and other events that access |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2091 glyph matrices are not processed while we are changing them. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2092 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2093 |
25012 | 2094 if (f) |
2095 adjust_frame_glyphs (f); | |
2096 else | |
2097 { | |
2098 Lisp_Object tail, lisp_frame; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2099 |
25012 | 2100 FOR_EACH_FRAME (tail, lisp_frame) |
2101 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2102 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2103 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2104 UNBLOCK_INPUT; |
25012 | 2105 } |
2106 | |
2107 | |
2108 /* Adjust frame glyphs when Emacs is initialized. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2109 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2110 To be called from init_display. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2111 |
25012 | 2112 We need a glyph matrix because redraw will happen soon. |
2113 Unfortunately, window sizes on selected_frame are not yet set to | |
2114 meaningful values. I believe we can assume that there are only two | |
2115 windows on the frame---the mini-buffer and the root window. Frame | |
2116 height and width seem to be correct so far. So, set the sizes of | |
2117 windows to estimated values. */ | |
2118 | |
2119 static void | |
2120 adjust_frame_glyphs_initially () | |
2121 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2122 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2123 struct window *root = XWINDOW (sf->root_window); |
25012 | 2124 struct window *mini = XWINDOW (root->next); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2125 int frame_lines = FRAME_LINES (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2126 int frame_cols = FRAME_COLS (sf); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2127 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2128 |
2129 /* Do it for the root window. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2130 XSETFASTINT (root->top_line, top_margin); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2131 XSETFASTINT (root->total_cols, frame_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2132 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
25012 | 2133 |
2134 /* Do it for the mini-buffer window. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2135 XSETFASTINT (mini->top_line, frame_lines - 1); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2136 XSETFASTINT (mini->total_cols, frame_cols); |
25012 | 2137 set_window_height (root->next, 1, 0); |
2138 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2139 adjust_frame_glyphs (sf); |
25012 | 2140 glyphs_initialized_initially_p = 1; |
2141 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2142 |
25012 | 2143 |
2144 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2145 | |
2146 static void | |
2147 adjust_frame_glyphs (f) | |
2148 struct frame *f; | |
2149 { | |
2150 if (FRAME_WINDOW_P (f)) | |
2151 adjust_frame_glyphs_for_window_redisplay (f); | |
2152 else | |
2153 adjust_frame_glyphs_for_frame_redisplay (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2154 |
25012 | 2155 /* Don't forget the message buffer and the buffer for |
2156 decode_mode_spec. */ | |
2157 adjust_frame_message_buffer (f); | |
2158 adjust_decode_mode_spec_buffer (f); | |
2159 | |
2160 f->glyphs_initialized_p = 1; | |
2161 } | |
2162 | |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2163 /* Return 1 if any window in the tree has nonzero window margins. See |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2164 the hack at the end of adjust_frame_glyphs_for_frame_redisplay. */ |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2165 static int |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2166 showing_window_margins_p (w) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2167 struct window *w; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2168 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2169 while (w) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2170 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2171 if (!NILP (w->hchild)) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2172 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2173 if (showing_window_margins_p (XWINDOW (w->hchild))) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2174 return 1; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2175 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2176 else if (!NILP (w->vchild)) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2177 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2178 if (showing_window_margins_p (XWINDOW (w->vchild))) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2179 return 1; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2180 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2181 else if (!NILP (w->left_margin_cols) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2182 || !NILP (w->right_margin_cols)) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2183 return 1; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2184 |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2185 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2186 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2187 return 0; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2188 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2189 |
25012 | 2190 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2191 /* In the window tree with root W, build current matrices of leaf |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2192 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2193 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2194 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2195 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2196 Lisp_Object window; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2197 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2198 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2199 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2200 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2201 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2202 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2203 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2204 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2205 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2206 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2207 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2208 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2209 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2210 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2211 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2212 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2213 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2214 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2215 xassert (m->matrix_h == WINDOW_TOTAL_LINES (w)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2216 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2217 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2218 for (i = 0; i < m->matrix_h; ++i) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2219 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2220 struct glyph_row *r = m->rows + i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2221 struct glyph_row *fr = fm->rows + i + WINDOW_TOP_EDGE_LINE (w); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2222 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2223 xassert (r->glyphs[TEXT_AREA] >= fr->glyphs[TEXT_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2224 && r->glyphs[LAST_AREA] <= fr->glyphs[LAST_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2225 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2226 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2227 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2228 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2229 r->used[LEFT_MARGIN_AREA] = m->left_margin_glyphs; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2230 r->used[RIGHT_MARGIN_AREA] = m->right_margin_glyphs; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2231 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2232 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2233 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2234 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2235 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2236 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2237 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2238 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2239 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2240 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2241 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2242 /* Save away the contents of frame F's current frame matrix. Value is |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
2243 a glyph matrix holding the contents of F's current frame matrix. */ |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2244 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2245 static struct glyph_matrix * |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2246 save_current_matrix (f) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2247 struct frame *f; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2248 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2249 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2250 struct glyph_matrix *saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2251 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2252 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2253 bzero (saved, sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2254 saved->nrows = f->current_matrix->nrows; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2255 saved->rows = (struct glyph_row *) xmalloc (saved->nrows |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2256 * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2257 bzero (saved->rows, saved->nrows * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2258 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2259 for (i = 0; i < saved->nrows; ++i) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2260 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2261 struct glyph_row *from = f->current_matrix->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2262 struct glyph_row *to = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2263 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2264 to->glyphs[TEXT_AREA] = (struct glyph *) xmalloc (nbytes); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2265 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2266 to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2267 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2268 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2269 return saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2270 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2271 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2272 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2273 /* Restore the contents of frame F's current frame matrix from SAVED, |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2274 and free memory associated with SAVED. */ |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2275 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2276 static void |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2277 restore_current_matrix (f, saved) |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2278 struct frame *f; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2279 struct glyph_matrix *saved; |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2280 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2281 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2282 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2283 for (i = 0; i < saved->nrows; ++i) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2284 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2285 struct glyph_row *from = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2286 struct glyph_row *to = f->current_matrix->rows + i; |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2287 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2288 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2289 to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2290 xfree (from->glyphs[TEXT_AREA]); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2291 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2292 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2293 xfree (saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2294 xfree (saved); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2295 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2296 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2297 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2298 |
25012 | 2299 /* Allocate/reallocate glyph matrices of a single frame F for |
2300 frame-based redisplay. */ | |
2301 | |
2302 static void | |
2303 adjust_frame_glyphs_for_frame_redisplay (f) | |
2304 struct frame *f; | |
2305 { | |
2306 struct dim matrix_dim; | |
2307 int pool_changed_p; | |
2308 int window_change_flags; | |
2309 int top_window_y; | |
2310 | |
2311 if (!FRAME_LIVE_P (f)) | |
2312 return; | |
2313 | |
2314 top_window_y = FRAME_TOP_MARGIN (f); | |
2315 | |
2316 /* Allocate glyph pool structures if not already done. */ | |
2317 if (f->desired_pool == NULL) | |
2318 { | |
2319 f->desired_pool = new_glyph_pool (); | |
2320 f->current_pool = new_glyph_pool (); | |
2321 } | |
2322 | |
2323 /* Allocate frames matrix structures if needed. */ | |
2324 if (f->desired_matrix == NULL) | |
2325 { | |
2326 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2327 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2328 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2329 |
25012 | 2330 /* Compute window glyph matrices. (This takes the mini-buffer |
2331 window into account). The result is the size of the frame glyph | |
2332 matrix needed. The variable window_change_flags is set to a bit | |
2333 mask indicating whether new matrices will be allocated or | |
2334 existing matrices change their size or location within the frame | |
2335 matrix. */ | |
2336 window_change_flags = 0; | |
2337 matrix_dim | |
2338 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2339 0, top_window_y, | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2340 1, |
25012 | 2341 &window_change_flags); |
2342 | |
2343 /* Add in menu bar lines, if any. */ | |
2344 matrix_dim.height += top_window_y; | |
2345 | |
2346 /* Enlarge pools as necessary. */ | |
2347 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2348 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2349 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2350 /* Set up glyph pointers within window matrices. Do this only if |
25012 | 2351 absolutely necessary since it requires a frame redraw. */ |
2352 if (pool_changed_p || window_change_flags) | |
2353 { | |
2354 /* Do it for window matrices. */ | |
2355 allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2356 0, top_window_y, 0, |
25012 | 2357 &window_change_flags); |
2358 | |
2359 /* Size of frame matrices must equal size of frame. Note | |
2360 that we are called for X frames with window widths NOT equal | |
2361 to the frame width (from CHANGE_FRAME_SIZE_1). */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2362 xassert (matrix_dim.width == FRAME_COLS (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2363 && matrix_dim.height == FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2364 |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2365 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2366 the update phase of redisplay, which means in general that a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2367 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2368 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2369 matrix sets the frame matrix up so that pointers are all into |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2370 the same pool. If we want to preserve glyph contents of the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2371 current matrix over a call to adjust_glyph_matrix, we must |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2372 make a copy of the current glyphs, and restore the current |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2373 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2374 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2375 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2376 && matrix_dim.width == f->current_matrix->matrix_w |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2377 && matrix_dim.height == f->current_matrix->matrix_h |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2378 /* For some reason, the frame glyph matrix gets corrupted if |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2379 any of the windows contain margins. I haven't been able |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2380 to hunt down the reason, but for the moment this prevents |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2381 the problem from manifesting. -- cyd */ |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2382 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2383 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2384 struct glyph_matrix *copy = save_current_matrix (f); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2385 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2386 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2387 restore_current_matrix (f, copy); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2388 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2389 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2390 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2391 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2392 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2393 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2394 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2395 } |
25012 | 2396 } |
2397 } | |
2398 | |
2399 | |
2400 /* Allocate/reallocate glyph matrices of a single frame F for | |
2401 window-based redisplay. */ | |
2402 | |
2403 static void | |
2404 adjust_frame_glyphs_for_window_redisplay (f) | |
2405 struct frame *f; | |
2406 { | |
2407 struct window *w; | |
2408 | |
2409 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2410 |
25012 | 2411 /* Allocate/reallocate window matrices. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2412 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
25012 | 2413 |
73383
015a870c0c9a
(adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73318
diff
changeset
|
2414 #ifdef HAVE_X_WINDOWS |
25012 | 2415 /* Allocate/ reallocate matrices of the dummy window used to display |
2416 the menu bar under X when no X toolkit support is available. */ | |
49322 | 2417 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
25012 | 2418 { |
2419 /* Allocate a dummy window if not already done. */ | |
2420 if (NILP (f->menu_bar_window)) | |
2421 { | |
2422 f->menu_bar_window = make_window (); | |
2423 w = XWINDOW (f->menu_bar_window); | |
2424 XSETFRAME (w->frame, f); | |
2425 w->pseudo_window_p = 1; | |
2426 } | |
2427 else | |
2428 w = XWINDOW (f->menu_bar_window); | |
2429 | |
2430 /* Set window dimensions to frame dimensions and allocate or | |
2431 adjust glyph matrices of W. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2432 XSETFASTINT (w->top_line, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2433 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2434 XSETFASTINT (w->total_lines, FRAME_MENU_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2435 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2436 allocate_matrices_for_window_redisplay (w); |
25012 | 2437 } |
73402
c76709b3cbc0
(adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73383
diff
changeset
|
2438 #endif /* not USE_X_TOOLKIT && not USE_GTK */ |
c76709b3cbc0
(adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73383
diff
changeset
|
2439 #endif /* HAVE_X_WINDOWS */ |
25012 | 2440 |
49322 | 2441 #ifndef USE_GTK |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2442 /* Allocate/ reallocate matrices of the tool bar window. If we |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2443 don't have a tool bar window yet, make one. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2444 if (NILP (f->tool_bar_window)) |
25012 | 2445 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2446 f->tool_bar_window = make_window (); |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2447 w = XWINDOW (f->tool_bar_window); |
25012 | 2448 XSETFRAME (w->frame, f); |
2449 w->pseudo_window_p = 1; | |
2450 } | |
2451 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2452 w = XWINDOW (f->tool_bar_window); |
25012 | 2453 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2454 XSETFASTINT (w->top_line, FRAME_MENU_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2455 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2456 XSETFASTINT (w->total_lines, FRAME_TOOL_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2457 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2458 allocate_matrices_for_window_redisplay (w); |
49322 | 2459 #endif |
25012 | 2460 } |
2461 | |
2462 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2463 /* Adjust/ allocate message buffer of frame F. |
25012 | 2464 |
2465 Note that the message buffer is never freed. Since I could not | |
2466 find a free in 19.34, I assume that freeing it would be | |
2467 problematic in some way and don't do it either. | |
2468 | |
2469 (Implementation note: It should be checked if we can free it | |
2470 eventually without causing trouble). */ | |
2471 | |
2472 static void | |
2473 adjust_frame_message_buffer (f) | |
2474 struct frame *f; | |
2475 { | |
2476 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2477 | |
2478 if (FRAME_MESSAGE_BUF (f)) | |
2479 { | |
2480 char *buffer = FRAME_MESSAGE_BUF (f); | |
2481 char *new_buffer = (char *) xrealloc (buffer, size); | |
2482 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2483 } | |
2484 else | |
2485 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2486 } | |
2487 | |
2488 | |
2489 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2490 | |
2491 static void | |
2492 adjust_decode_mode_spec_buffer (f) | |
2493 struct frame *f; | |
2494 { | |
2495 f->decode_mode_spec_buffer | |
2496 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2497 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2498 } | |
2499 | |
2500 | |
2501 | |
2502 /********************************************************************** | |
2503 Freeing Glyph Matrices | |
2504 **********************************************************************/ | |
2505 | |
2506 /* Free glyph memory for a frame F. F may be null. This function can | |
2507 be called for the same frame more than once. The root window of | |
2508 F may be nil when this function is called. This is the case when | |
2509 the function is called when F is destroyed. */ | |
2510 | |
2511 void | |
2512 free_glyphs (f) | |
2513 struct frame *f; | |
2514 { | |
2515 if (f && f->glyphs_initialized_p) | |
2516 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2517 /* Block interrupt input so that we don't get surprised by an X |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2518 event while we're in an inconsistent state. */ |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2519 BLOCK_INPUT; |
25012 | 2520 f->glyphs_initialized_p = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2521 |
25012 | 2522 /* Release window sub-matrices. */ |
2523 if (!NILP (f->root_window)) | |
2524 free_window_matrices (XWINDOW (f->root_window)); | |
2525 | |
2526 /* Free the dummy window for menu bars without X toolkit and its | |
2527 glyph matrices. */ | |
2528 if (!NILP (f->menu_bar_window)) | |
2529 { | |
2530 struct window *w = XWINDOW (f->menu_bar_window); | |
2531 free_glyph_matrix (w->desired_matrix); | |
2532 free_glyph_matrix (w->current_matrix); | |
2533 w->desired_matrix = w->current_matrix = NULL; | |
2534 f->menu_bar_window = Qnil; | |
2535 } | |
2536 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2537 /* Free the tool bar window and its glyph matrices. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2538 if (!NILP (f->tool_bar_window)) |
25012 | 2539 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2540 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2541 free_glyph_matrix (w->desired_matrix); |
2542 free_glyph_matrix (w->current_matrix); | |
2543 w->desired_matrix = w->current_matrix = NULL; | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2544 f->tool_bar_window = Qnil; |
25012 | 2545 } |
2546 | |
2547 /* Release frame glyph matrices. Reset fields to zero in | |
2548 case we are called a second time. */ | |
2549 if (f->desired_matrix) | |
2550 { | |
2551 free_glyph_matrix (f->desired_matrix); | |
2552 free_glyph_matrix (f->current_matrix); | |
2553 f->desired_matrix = f->current_matrix = NULL; | |
2554 } | |
2555 | |
2556 /* Release glyph pools. */ | |
2557 if (f->desired_pool) | |
2558 { | |
2559 free_glyph_pool (f->desired_pool); | |
2560 free_glyph_pool (f->current_pool); | |
2561 f->desired_pool = f->current_pool = NULL; | |
314 | 2562 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2563 |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2564 UNBLOCK_INPUT; |
314 | 2565 } |
2566 } | |
2567 | |
25012 | 2568 |
2569 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2570 function may be called with a null pointer, and it may be called on | |
2571 the same tree more than once. */ | |
2572 | |
2573 void | |
2574 free_window_matrices (w) | |
2575 struct window *w; | |
2576 { | |
2577 while (w) | |
2578 { | |
2579 if (!NILP (w->hchild)) | |
2580 free_window_matrices (XWINDOW (w->hchild)); | |
2581 else if (!NILP (w->vchild)) | |
2582 free_window_matrices (XWINDOW (w->vchild)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2583 else |
25012 | 2584 { |
2585 /* This is a leaf window. Free its memory and reset fields | |
2586 to zero in case this function is called a second time for | |
2587 W. */ | |
2588 free_glyph_matrix (w->current_matrix); | |
2589 free_glyph_matrix (w->desired_matrix); | |
2590 w->current_matrix = w->desired_matrix = NULL; | |
2591 } | |
2592 | |
2593 /* Next window on same level. */ | |
2594 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2595 } | |
2596 } | |
2597 | |
2598 | |
2599 /* Check glyph memory leaks. This function is called from | |
2600 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2601 exits. We therefore free all glyph memory for all active frames | |
2602 explicitly and check that nothing is left allocated. */ | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2603 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2604 void |
25012 | 2605 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2606 { |
25012 | 2607 Lisp_Object tail, frame; |
2608 | |
2609 /* Free glyph memory for all frames. */ | |
2610 FOR_EACH_FRAME (tail, frame) | |
2611 free_glyphs (XFRAME (frame)); | |
2612 | |
2613 /* Check that nothing is left allocated. */ | |
2614 if (glyph_matrix_count) | |
2615 abort (); | |
2616 if (glyph_pool_count) | |
2617 abort (); | |
2618 } | |
2619 | |
2620 | |
2621 | |
2622 /********************************************************************** | |
2623 Building a Frame Matrix | |
2624 **********************************************************************/ | |
2625 | |
2626 /* Most of the redisplay code works on glyph matrices attached to | |
2627 windows. This is a good solution most of the time, but it is not | |
2628 suitable for terminal code. Terminal output functions cannot rely | |
2629 on being able to set an arbitrary terminal window. Instead they | |
2630 must be provided with a view of the whole frame, i.e. the whole | |
2631 screen. We build such a view by constructing a frame matrix from | |
2632 window matrices in this section. | |
2633 | |
2634 Windows that must be updated have their must_be_update_p flag set. | |
2635 For all such windows, their desired matrix is made part of the | |
2636 desired frame matrix. For other windows, their current matrix is | |
2637 made part of the desired frame matrix. | |
2638 | |
2639 +-----------------+----------------+ | |
2640 | desired | desired | | |
2641 | | | | |
2642 +-----------------+----------------+ | |
2643 | current | | |
2644 | | | |
2645 +----------------------------------+ | |
2646 | |
2647 Desired window matrices can be made part of the frame matrix in a | |
2648 cheap way: We exploit the fact that the desired frame matrix and | |
2649 desired window matrices share their glyph memory. This is not | |
2650 possible for current window matrices. Their glyphs are copied to | |
2651 the desired frame matrix. The latter is equivalent to | |
2652 preserve_other_columns in the old redisplay. | |
2653 | |
2654 Used glyphs counters for frame matrix rows are the result of adding | |
2655 up glyph lengths of the window matrices. A line in the frame | |
2656 matrix is enabled, if a corresponding line in a window matrix is | |
2657 enabled. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2658 |
25012 | 2659 After building the desired frame matrix, it will be passed to |
2660 terminal code, which will manipulate both the desired and current | |
2661 frame matrix. Changes applied to the frame's current matrix have | |
2662 to be visible in current window matrices afterwards, of course. | |
2663 | |
2664 This problem is solved like this: | |
2665 | |
2666 1. Window and frame matrices share glyphs. Window matrices are | |
2667 constructed in a way that their glyph contents ARE the glyph | |
2668 contents needed in a frame matrix. Thus, any modification of | |
2669 glyphs done in terminal code will be reflected in window matrices | |
2670 automatically. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2671 |
25012 | 2672 2. Exchanges of rows in a frame matrix done by terminal code are |
2673 intercepted by hook functions so that corresponding row operations | |
2674 on window matrices can be performed. This is necessary because we | |
2675 use pointers to glyphs in glyph row structures. To satisfy the | |
2676 assumption of point 1 above that glyphs are updated implicitly in | |
2677 window matrices when they are manipulated via the frame matrix, | |
2678 window and frame matrix must of course agree where to find the | |
2679 glyphs for their rows. Possible manipulations that must be | |
2680 mirrored are assignments of rows of the desired frame matrix to the | |
2681 current frame matrix and scrolling the current frame matrix. */ | |
2682 | |
2683 /* Build frame F's desired matrix from window matrices. Only windows | |
2684 which have the flag must_be_updated_p set have to be updated. Menu | |
2685 bar lines of a frame are not covered by window matrices, so make | |
2686 sure not to touch them in this function. */ | |
2687 | |
2688 static void | |
2689 build_frame_matrix (f) | |
2690 struct frame *f; | |
2691 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2692 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2693 |
25012 | 2694 /* F must have a frame matrix when this function is called. */ |
2695 xassert (!FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2696 |
25012 | 2697 /* Clear all rows in the frame matrix covered by window matrices. |
2698 Menu bar lines are not covered by windows. */ | |
2699 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2700 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2701 | |
2702 /* Build the matrix by walking the window tree. */ | |
2703 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2704 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2705 } | |
2706 | |
2707 | |
2708 /* Walk a window tree, building a frame matrix MATRIX from window | |
2709 matrices. W is the root of a window tree. */ | |
2710 | |
2711 static void | |
2712 build_frame_matrix_from_window_tree (matrix, w) | |
2713 struct glyph_matrix *matrix; | |
2714 struct window *w; | |
2715 { | |
2716 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2717 { |
25012 | 2718 if (!NILP (w->hchild)) |
2719 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2720 else if (!NILP (w->vchild)) | |
2721 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2722 else | |
2723 build_frame_matrix_from_leaf_window (matrix, w); | |
2724 | |
2725 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2726 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2727 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2728 |
25012 | 2729 |
2730 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2731 desired frame matrix built. W is a leaf window whose desired or | |
2732 current matrix is to be added to FRAME_MATRIX. W's flag | |
2733 must_be_updated_p determines which matrix it contributes to | |
2734 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2735 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2736 Adding a desired matrix means setting up used counters and such in | |
2737 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2738 means copying glyphs. The latter case corresponds to | |
2739 preserve_other_columns in the old redisplay. */ | |
2740 | |
2741 static void | |
2742 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2743 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2744 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2745 { |
25012 | 2746 struct glyph_matrix *window_matrix; |
2747 int window_y, frame_y; | |
2748 /* If non-zero, a glyph to insert at the right border of W. */ | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2749 GLYPH right_border_glyph; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2750 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2751 SET_GLYPH_FROM_CHAR (right_border_glyph, 0); |
25012 | 2752 |
2753 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2754 if (w->must_be_updated_p) | |
2755 { | |
2756 window_matrix = w->desired_matrix; | |
2757 | |
2758 /* Decide whether we want to add a vertical border glyph. */ | |
2759 if (!WINDOW_RIGHTMOST_P (w)) | |
2760 { | |
2761 struct Lisp_Char_Table *dp = window_display_table (w); | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2762 Lisp_Object gc; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2763 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2764 SET_GLYPH_FROM_CHAR (right_border_glyph, '|'); |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2765 if (dp |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2766 && (gc = DISP_BORDER_GLYPH (dp), GLYPH_CODE_P (gc)) |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2767 && GLYPH_CODE_CHAR_VALID_P (gc)) |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2768 { |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2769 SET_GLYPH_FROM_GLYPH_CODE (right_border_glyph, gc); |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2770 spec_glyph_lookup_face (w, &right_border_glyph); |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2771 } |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2772 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2773 if (GLYPH_FACE (right_border_glyph) <= 0) |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2774 SET_GLYPH_FACE (right_border_glyph, VERTICAL_BORDER_FACE_ID); |
25012 | 2775 } |
2776 } | |
2777 else | |
2778 window_matrix = w->current_matrix; | |
2779 | |
2780 /* For all rows in the window matrix and corresponding rows in the | |
2781 frame matrix. */ | |
2782 window_y = 0; | |
2783 frame_y = window_matrix->matrix_y; | |
2784 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2785 { |
25012 | 2786 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2787 struct glyph_row *window_row = window_matrix->rows + window_y; | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2788 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2789 |
2790 /* Fill up the frame row with spaces up to the left margin of the | |
2791 window row. */ | |
2792 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2793 | |
2794 /* Fill up areas in the window matrix row with spaces. */ | |
2795 fill_up_glyph_row_with_spaces (window_row); | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2796 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2797 /* If only part of W's desired matrix has been built, and |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2798 window_row wasn't displayed, use the corresponding current |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2799 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2800 if (window_matrix == w->desired_matrix |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2801 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2802 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2803 window_row = w->current_matrix->rows + window_y; |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2804 current_row_p = 1; |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2805 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2806 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2807 if (current_row_p) |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2808 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2809 /* Copy window row to frame row. */ |
25012 | 2810 bcopy (window_row->glyphs[0], |
2811 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2812 window_matrix->matrix_w * sizeof (struct glyph)); | |
2813 } | |
2814 else | |
2815 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2816 xassert (window_row->enabled_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2817 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2818 /* Only when a desired row has been displayed, we want |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2819 the corresponding frame row to be updated. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2820 frame_row->enabled_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2821 |
25012 | 2822 /* Maybe insert a vertical border between horizontally adjacent |
2823 windows. */ | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2824 if (GLYPH_CHAR (right_border_glyph) != 0) |
25012 | 2825 { |
2826 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2827 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2828 } | |
2829 | |
59902
4a0a167cb6c4
(build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents:
59879
diff
changeset
|
2830 #if GLYPH_DEBUG |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2831 /* Window row window_y must be a slice of frame row |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2832 frame_y. */ |
25012 | 2833 xassert (glyph_row_slice_p (window_row, frame_row)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2834 |
25012 | 2835 /* If rows are in sync, we don't have to copy glyphs because |
2836 frame and window share glyphs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2837 |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2838 strcpy (w->current_matrix->method, w->desired_matrix->method); |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
2839 add_window_display_history (w, w->current_matrix->method, 0); |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2840 #endif |
25012 | 2841 } |
2842 | |
2843 /* Set number of used glyphs in the frame matrix. Since we fill | |
2844 up with spaces, and visit leaf windows from left to right it | |
2845 can be done simply. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2846 frame_row->used[TEXT_AREA] |
25012 | 2847 = window_matrix->matrix_x + window_matrix->matrix_w; |
2848 | |
2849 /* Next row. */ | |
2850 ++window_y; | |
2851 ++frame_y; | |
2852 } | |
2853 } | |
2854 | |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2855 /* Given a user-specified glyph, possibly including a Lisp-level face |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2856 ID, return a glyph that has a realized face ID. |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2857 This is used for glyphs displayed specially and not part of the text; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2858 for instance, vertical separators, truncation markers, etc. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2859 |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2860 void |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2861 spec_glyph_lookup_face (w, glyph) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2862 struct window *w; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2863 GLYPH *glyph; |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2864 { |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2865 int lface_id = GLYPH_FACE (*glyph); |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2866 /* Convert the glyph's specified face to a realized (cache) face. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2867 if (lface_id > 0) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2868 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2869 int face_id = merge_faces (XFRAME (w->frame), |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2870 Qt, lface_id, DEFAULT_FACE_ID); |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2871 SET_GLYPH_FACE (*glyph, face_id); |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2872 } |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2873 } |
25012 | 2874 |
2875 /* Add spaces to a glyph row ROW in a window matrix. | |
2876 | |
2877 Each row has the form: | |
2878 | |
2879 +---------+-----------------------------+------------+ | |
2880 | left | text | right | | |
2881 +---------+-----------------------------+------------+ | |
2882 | |
2883 Left and right marginal areas are optional. This function adds | |
2884 spaces to areas so that there are no empty holes between areas. | |
2885 In other words: If the right area is not empty, the text area | |
2886 is filled up with spaces up to the right area. If the text area | |
2887 is not empty, the left area is filled up. | |
2888 | |
2889 To be called for frame-based redisplay, only. */ | |
2890 | |
2891 static void | |
2892 fill_up_glyph_row_with_spaces (row) | |
2893 struct glyph_row *row; | |
2894 { | |
2895 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2896 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2897 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2898 } | |
2899 | |
2900 | |
2901 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2902 frame-based redisplay only. */ | |
2903 | |
2904 static void | |
2905 fill_up_glyph_row_area_with_spaces (row, area) | |
2906 struct glyph_row *row; | |
2907 int area; | |
2908 { | |
2909 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2910 { | |
2911 struct glyph *end = row->glyphs[area + 1]; | |
2912 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2913 | |
2914 while (text < end) | |
2915 *text++ = space_glyph; | |
2916 row->used[area] = text - row->glyphs[area]; | |
2917 } | |
2918 } | |
2919 | |
2920 | |
2921 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2922 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2923 | |
2924 static void | |
2925 fill_up_frame_row_with_spaces (row, upto) | |
2926 struct glyph_row *row; | |
2927 int upto; | |
2928 { | |
2929 int i = row->used[TEXT_AREA]; | |
2930 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2931 |
25012 | 2932 while (i < upto) |
2933 glyph[i++] = space_glyph; | |
2934 | |
2935 row->used[TEXT_AREA] = i; | |
2936 } | |
2937 | |
2938 | |
2939 | |
2940 /********************************************************************** | |
2941 Mirroring operations on frame matrices in window matrices | |
2942 **********************************************************************/ | |
2943 | |
2944 /* Set frame being updated via frame-based redisplay to F. This | |
2945 function must be called before updates to make explicit that we are | |
2946 working on frame matrices or not. */ | |
2947 | |
2948 static INLINE void | |
2949 set_frame_matrix_frame (f) | |
2950 struct frame *f; | |
2951 { | |
2952 frame_matrix_frame = f; | |
2953 } | |
2954 | |
2955 | |
2956 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2957 DESIRED_MATRIX is the desired matrix corresponding to | |
2958 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2959 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2960 frame_matrix_frame is non-null, this indicates that the exchange is | |
2961 done in frame matrices, and that we have to perform analogous | |
2962 operations in window matrices of frame_matrix_frame. */ | |
2963 | |
2964 static INLINE void | |
2965 make_current (desired_matrix, current_matrix, row) | |
2966 struct glyph_matrix *desired_matrix, *current_matrix; | |
2967 int row; | |
2968 { | |
2969 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2970 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, row); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
2971 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2972 |
2973 /* Do current_row = desired_row. This exchanges glyph pointers | |
2974 between both rows, and does a structure assignment otherwise. */ | |
2975 assign_row (current_row, desired_row); | |
2976 | |
2977 /* Enable current_row to mark it as valid. */ | |
2978 current_row->enabled_p = 1; | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
2979 current_row->mouse_face_p = mouse_face_p; |
25012 | 2980 |
2981 /* If we are called on frame matrices, perform analogous operations | |
2982 for window matrices. */ | |
2983 if (frame_matrix_frame) | |
2984 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2985 } | |
2986 | |
2987 | |
2988 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2989 W's frame which has been made current (by swapping pointers between | |
2990 current and desired matrix). Perform analogous operations in the | |
2991 matrices of leaf windows in the window tree rooted at W. */ | |
2992 | |
2993 static void | |
2994 mirror_make_current (w, frame_row) | |
2995 struct window *w; | |
2996 int frame_row; | |
2997 { | |
2998 while (w) | |
2999 { | |
3000 if (!NILP (w->hchild)) | |
3001 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
3002 else if (!NILP (w->vchild)) | |
3003 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
3004 else | |
3005 { | |
3006 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
3007 here because the checks performed in debug mode there | |
3008 will not allow the conversion. */ | |
3009 int row = frame_row - w->desired_matrix->matrix_y; | |
3010 | |
3011 /* If FRAME_ROW is within W, assign the desired row to the | |
3012 current row (exchanging glyph pointers). */ | |
3013 if (row >= 0 && row < w->desired_matrix->matrix_h) | |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
3014 { |
25012 | 3015 struct glyph_row *current_row |
3016 = MATRIX_ROW (w->current_matrix, row); | |
3017 struct glyph_row *desired_row | |
3018 = MATRIX_ROW (w->desired_matrix, row); | |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3019 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3020 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3021 assign_row (current_row, desired_row); |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3022 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3023 swap_glyph_pointers (desired_row, current_row); |
25012 | 3024 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
3025 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
3026 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3027 |
25012 | 3028 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
3029 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
3030 } |
25012 | 3031 |
3032 | |
3033 /* Perform row dance after scrolling. We are working on the range of | |
3034 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
3035 including) in MATRIX. COPY_FROM is a vector containing, for each | |
3036 row I in the range 0 <= I < NLINES, the index of the original line | |
3037 to move to I. This index is relative to the row range, i.e. 0 <= | |
3038 index < NLINES. RETAINED_P is a vector containing zero for each | |
3039 row 0 <= I < NLINES which is empty. | |
3040 | |
3041 This function is called from do_scrolling and do_direct_scrolling. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3042 |
25012 | 3043 void |
3044 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
3045 retained_p) | |
3046 struct glyph_matrix *matrix; | |
3047 int unchanged_at_top, nlines; | |
3048 int *copy_from; | |
3049 char *retained_p; | |
3050 { | |
3051 /* A copy of original rows. */ | |
3052 struct glyph_row *old_rows; | |
3053 | |
3054 /* Rows to assign to. */ | |
3055 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3056 |
25012 | 3057 int i; |
3058 | |
3059 /* Make a copy of the original rows. */ | |
3060 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
3061 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
3062 | |
3063 /* Assign new rows, maybe clear lines. */ | |
3064 for (i = 0; i < nlines; ++i) | |
3065 { | |
3066 int enabled_before_p = new_rows[i].enabled_p; | |
3067 | |
3068 xassert (i + unchanged_at_top < matrix->nrows); | |
3069 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
3070 new_rows[i] = old_rows[copy_from[i]]; | |
3071 new_rows[i].enabled_p = enabled_before_p; | |
3072 | |
3073 /* RETAINED_P is zero for empty lines. */ | |
3074 if (!retained_p[copy_from[i]]) | |
3075 new_rows[i].enabled_p = 0; | |
3076 } | |
3077 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3078 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
25012 | 3079 if (frame_matrix_frame) |
3080 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
3081 unchanged_at_top, nlines, copy_from, retained_p); | |
3082 } | |
3083 | |
3084 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3085 /* Synchronize glyph pointers in the current matrix of window W with |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3086 the current frame matrix. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3087 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3088 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3089 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3090 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3091 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3092 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3093 struct glyph_row *window_row, *window_row_end, *frame_row; |
40271
ae4848857075
(sync_window_with_frame_matrix_rows): Remove unused variable `area'.
Pavel Janík <Pavel@Janik.cz>
parents:
40214
diff
changeset
|
3094 int left, right, x, width; |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3095 |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3096 /* Preconditions: W must be a leaf window on a tty frame. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3097 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3098 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3099 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3100 left = margin_glyphs_to_reserve (w, 1, w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3101 right = margin_glyphs_to_reserve (w, 1, w->right_margin_cols); |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3102 x = w->current_matrix->matrix_x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3103 width = w->current_matrix->matrix_w; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3104 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3105 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3106 window_row_end = window_row + w->current_matrix->nrows; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3107 frame_row = f->current_matrix->rows + WINDOW_TOP_EDGE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3108 |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3109 for (; window_row < window_row_end; ++window_row, ++frame_row) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3110 { |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3111 window_row->glyphs[LEFT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3112 = frame_row->glyphs[0] + x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3113 window_row->glyphs[TEXT_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3114 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3115 window_row->glyphs[LAST_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3116 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3117 window_row->glyphs[RIGHT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3118 = window_row->glyphs[LAST_AREA] - right; |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3119 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3120 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3121 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3122 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3123 /* Return the window in the window tree rooted in W containing frame |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3124 row ROW. Value is null if none is found. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3125 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3126 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3127 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3128 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3129 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3130 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3131 struct window *found = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3132 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3133 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3134 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3135 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3136 found = frame_row_to_window (XWINDOW (w->hchild), row); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3137 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3138 found = frame_row_to_window (XWINDOW (w->vchild), row); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3139 else if (row >= WINDOW_TOP_EDGE_LINE (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3140 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3141 found = w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3142 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3143 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3144 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3145 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3146 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3147 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3148 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3149 |
25012 | 3150 /* Perform a line dance in the window tree rooted at W, after |
3151 scrolling a frame matrix in mirrored_line_dance. | |
3152 | |
3153 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3154 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3155 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3156 I < NLINES, the index of the original line to move to I. This | |
3157 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3158 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3159 which is empty. */ | |
3160 | |
3161 static void | |
3162 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3163 struct window *w; | |
3164 int unchanged_at_top, nlines; | |
3165 int *copy_from; | |
3166 char *retained_p; | |
3167 { | |
3168 while (w) | |
3169 { | |
3170 if (!NILP (w->hchild)) | |
3171 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3172 nlines, copy_from, retained_p); | |
3173 else if (!NILP (w->vchild)) | |
3174 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3175 nlines, copy_from, retained_p); | |
3176 else | |
3177 { | |
3178 /* W is a leaf window, and we are working on its current | |
3179 matrix m. */ | |
3180 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3181 int i, sync_p = 0; |
25012 | 3182 struct glyph_row *old_rows; |
3183 | |
3184 /* Make a copy of the original rows of matrix m. */ | |
3185 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3186 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3187 | |
3188 for (i = 0; i < nlines; ++i) | |
3189 { | |
3190 /* Frame relative line assigned to. */ | |
3191 int frame_to = i + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3192 |
25012 | 3193 /* Frame relative line assigned. */ |
3194 int frame_from = copy_from[i] + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3195 |
25012 | 3196 /* Window relative line assigned to. */ |
3197 int window_to = frame_to - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3198 |
25012 | 3199 /* Window relative line assigned. */ |
3200 int window_from = frame_from - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3201 |
25012 | 3202 /* Is assigned line inside window? */ |
3203 int from_inside_window_p | |
3204 = window_from >= 0 && window_from < m->matrix_h; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3205 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3206 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3207 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3208 = window_to >= 0 && window_to < m->matrix_h; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3209 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3210 if (from_inside_window_p && to_inside_window_p) |
25012 | 3211 { |
3212 /* Enabled setting before assignment. */ | |
3213 int enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3214 |
25012 | 3215 /* Do the assignment. The enabled_p flag is saved |
3216 over the assignment because the old redisplay did | |
3217 that. */ | |
3218 enabled_before_p = m->rows[window_to].enabled_p; | |
3219 m->rows[window_to] = old_rows[window_from]; | |
3220 m->rows[window_to].enabled_p = enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3221 |
25012 | 3222 /* If frame line is empty, window line is empty, too. */ |
3223 if (!retained_p[copy_from[i]]) | |
3224 m->rows[window_to].enabled_p = 0; | |
3225 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3226 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3227 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3228 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3229 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3230 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3231 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3232 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3233 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3234 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3235 |
60684
18bf961ed63a
(mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents:
59905
diff
changeset
|
3236 w2 = frame_row_to_window (root, frame_from); |
61416
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3237 /* ttn@surf.glug.org: when enabling menu bar using `emacs |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3238 -nw', FROM_FRAME sometimes has no associated window. |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3239 This check avoids a segfault if W2 is null. */ |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3240 if (w2) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3241 { |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3242 m2 = w2->current_matrix; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3243 m2_from = frame_from - m2->matrix_y; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3244 copy_row_except_pointers (m->rows + window_to, |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3245 m2->rows + m2_from); |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3246 |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3247 /* If frame line is empty, window line is empty, too. */ |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3248 if (!retained_p[copy_from[i]]) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3249 m->rows[window_to].enabled_p = 0; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3250 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3251 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3252 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3253 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3254 sync_p = 1; |
25012 | 3255 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3256 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3257 /* If there was a copy between windows, make sure glyph |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3258 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3259 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3260 sync_window_with_frame_matrix_rows (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3261 |
25012 | 3262 /* Check that no pointers are lost. */ |
3263 CHECK_MATRIX (m); | |
3264 } | |
3265 | |
3266 /* Next window on same level. */ | |
3267 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3268 } | |
3269 } | |
3270 | |
3271 | |
3272 #if GLYPH_DEBUG | |
3273 | |
3274 /* Check that window and frame matrices agree about their | |
3275 understanding where glyphs of the rows are to find. For each | |
3276 window in the window tree rooted at W, check that rows in the | |
3277 matrices of leaf window agree with their frame matrices about | |
3278 glyph pointers. */ | |
314 | 3279 |
21514 | 3280 void |
25012 | 3281 check_window_matrix_pointers (w) |
314 | 3282 struct window *w; |
3283 { | |
25012 | 3284 while (w) |
3285 { | |
3286 if (!NILP (w->hchild)) | |
3287 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3288 else if (!NILP (w->vchild)) | |
3289 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3290 else | |
3291 { | |
3292 struct frame *f = XFRAME (w->frame); | |
3293 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3294 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3295 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3296 |
25012 | 3297 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
3298 } | |
3299 } | |
3300 | |
3301 | |
3302 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3303 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3304 each row in WINDOW_MATRIX check that it's a slice of the | |
3305 corresponding frame row. If it isn't, abort. */ | |
3306 | |
3307 static void | |
3308 check_matrix_pointers (window_matrix, frame_matrix) | |
3309 struct glyph_matrix *window_matrix, *frame_matrix; | |
3310 { | |
3311 /* Row number in WINDOW_MATRIX. */ | |
3312 int i = 0; | |
3313 | |
3314 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3315 int j = window_matrix->matrix_y; | |
3316 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3317 /* For all rows check that the row in the window matrix is a |
25012 | 3318 slice of the row in the frame matrix. If it isn't we didn't |
3319 mirror an operation on the frame matrix correctly. */ | |
3320 while (i < window_matrix->nrows) | |
3321 { | |
3322 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3323 frame_matrix->rows + j)) | |
3324 abort (); | |
3325 ++i, ++j; | |
3326 } | |
3327 } | |
3328 | |
3329 #endif /* GLYPH_DEBUG != 0 */ | |
3330 | |
3331 | |
3332 | |
3333 /********************************************************************** | |
3334 VPOS and HPOS translations | |
3335 **********************************************************************/ | |
3336 | |
3337 #if GLYPH_DEBUG | |
3338 | |
3339 /* Translate vertical position VPOS which is relative to window W to a | |
3340 vertical position relative to W's frame. */ | |
3341 | |
3342 static int | |
3343 window_to_frame_vpos (w, vpos) | |
3344 struct window *w; | |
3345 int vpos; | |
3346 { | |
3347 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3348 |
25012 | 3349 xassert (!FRAME_WINDOW_P (f)); |
3350 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows); | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3351 vpos += WINDOW_TOP_EDGE_LINE (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3352 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
25012 | 3353 return vpos; |
3354 } | |
3355 | |
3356 | |
3357 /* Translate horizontal position HPOS which is relative to window W to | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3358 a horizontal position relative to W's frame. */ |
25012 | 3359 |
3360 static int | |
3361 window_to_frame_hpos (w, hpos) | |
3362 struct window *w; | |
3363 int hpos; | |
3364 { | |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
3365 xassert (!FRAME_WINDOW_P (XFRAME (w->frame))); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3366 hpos += WINDOW_LEFT_EDGE_COL (w); |
25012 | 3367 return hpos; |
314 | 3368 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3369 |
25012 | 3370 #endif /* GLYPH_DEBUG */ |
3371 | |
3372 | |
314 | 3373 |
25012 | 3374 /********************************************************************** |
3375 Redrawing Frames | |
3376 **********************************************************************/ | |
3377 | |
3378 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3379 doc: /* Clear frame FRAME and output again what is supposed to appear on it. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3380 (frame) |
25012 | 3381 Lisp_Object frame; |
3382 { | |
3383 struct frame *f; | |
3384 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3385 CHECK_LIVE_FRAME (frame); |
25012 | 3386 f = XFRAME (frame); |
3387 | |
3388 /* Ignore redraw requests, if frame has no glyphs yet. | |
3389 (Implementation note: It still has to be checked why we are | |
3390 called so early here). */ | |
3391 if (!glyphs_initialized_initially_p) | |
3392 return Qnil; | |
3393 | |
3394 update_begin (f); | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3395 #ifdef MSDOS |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3396 if (FRAME_MSDOS_P (f)) |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
3397 set_terminal_modes (FRAME_TERMINAL (f)); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3398 #endif |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3399 clear_frame (f); |
25012 | 3400 clear_current_matrices (f); |
3401 update_end (f); | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3402 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3403 fflush (FRAME_TTY (f)->output); |
25012 | 3404 windows_or_buffers_changed++; |
3405 /* Mark all windows as inaccurate, so that every window will have | |
3406 its redisplay done. */ | |
3407 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3408 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3409 f->garbaged = 0; | |
3410 return Qnil; | |
3411 } | |
3412 | |
3413 | |
3414 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3415 function redraw-frame. */ | |
3416 | |
3417 void | |
3418 redraw_frame (f) | |
3419 struct frame *f; | |
3420 { | |
3421 Lisp_Object frame; | |
3422 XSETFRAME (frame, f); | |
3423 Fredraw_frame (frame); | |
3424 } | |
3425 | |
3426 | |
3427 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3428 doc: /* Clear and redisplay all visible frames. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3429 () |
25012 | 3430 { |
3431 Lisp_Object tail, frame; | |
3432 | |
3433 FOR_EACH_FRAME (tail, frame) | |
3434 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3435 Fredraw_frame (frame); | |
3436 | |
3437 return Qnil; | |
3438 } | |
3439 | |
3440 | |
3441 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3442 visible frames marked as garbaged. */ | |
3443 | |
3444 void | |
3445 redraw_garbaged_frames () | |
3446 { | |
3447 Lisp_Object tail, frame; | |
3448 | |
3449 FOR_EACH_FRAME (tail, frame) | |
3450 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3451 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3452 Fredraw_frame (frame); | |
3453 } | |
3454 | |
3455 | |
3456 | |
3457 /*********************************************************************** | |
3458 Direct Operations | |
3459 ***********************************************************************/ | |
3460 | |
3461 /* Try to update display and current glyph matrix directly. | |
3462 | |
3463 This function is called after a character G has been inserted into | |
3464 current_buffer. It tries to update the current glyph matrix and | |
3465 perform appropriate screen output to reflect the insertion. If it | |
3466 succeeds, the global flag redisplay_performed_directly_p will be | |
3467 set to 1, and thereby prevent the more costly general redisplay | |
3468 from running (see redisplay_internal). | |
3469 | |
3470 This function is not called for `hairy' character insertions. | |
3471 In particular, it is not called when after or before change | |
3472 functions exist, like they are used by font-lock. See keyboard.c | |
3473 for details where this function is called. */ | |
314 | 3474 |
3475 int | |
3476 direct_output_for_insert (g) | |
3477 int g; | |
3478 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3479 register struct frame *f = SELECTED_FRAME (); |
25012 | 3480 struct window *w = XWINDOW (selected_window); |
3481 struct it it, it2; | |
3482 struct glyph_row *glyph_row; | |
3483 struct glyph *glyphs, *glyph, *end; | |
3484 int n; | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3485 /* Non-null means that redisplay of W is based on window matrices. */ |
25012 | 3486 int window_redisplay_p = FRAME_WINDOW_P (f); |
3487 /* Non-null means we are in overwrite mode. */ | |
3488 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3489 int added_width; | |
3490 struct text_pos pos; | |
3491 int delta, delta_bytes; | |
3492 | |
3493 /* Not done directly. */ | |
3494 redisplay_performed_directly_p = 0; | |
3495 | |
3496 /* Quickly give up for some common cases. */ | |
3497 if (cursor_in_echo_area | |
3498 /* Give up if fonts have changed. */ | |
3499 || fonts_changed_p | |
3500 /* Give up if face attributes have been changed. */ | |
3501 || face_change_count | |
3502 /* Give up if cursor position not really known. */ | |
314 | 3503 || !display_completed |
25012 | 3504 /* Give up if buffer appears in two places. */ |
314 | 3505 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3506 /* Give up if currently displaying a message instead of the |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3507 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3508 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3509 && EQ (minibuf_window, echo_area_window)) |
25012 | 3510 /* Give up for hscrolled mini-buffer because display of the prompt |
3511 is handled specially there (see display_line). */ | |
3512 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3513 /* Give up if overwriting in the middle of a line. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3514 || (overwrite_p |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3515 && PT != ZV |
25012 | 3516 && FETCH_BYTE (PT) != '\n') |
3517 /* Give up for tabs and line ends. */ | |
3518 || g == '\t' | |
3519 || g == '\n' | |
3520 || g == '\r' | |
96236
8a7483c32b73
(direct_output_for_insert): Avoid direct output when inserting a space
Chong Yidong <cyd@stupidchicken.com>
parents:
95639
diff
changeset
|
3521 || (g == ' ' && !NILP (current_buffer->word_wrap)) |
25012 | 3522 /* Give up if unable to display the cursor in the window. */ |
3523 || w->cursor.vpos < 0 | |
36279
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3524 /* Give up if we are showing a message or just cleared the message |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3525 because we might need to resize the echo area window. */ |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3526 || !NILP (echo_area_buffer[0]) |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3527 || !NILP (echo_area_buffer[1]) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3528 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos), |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3529 /* Can't do it in a continued line because continuation |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3530 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3531 (glyph_row->continued_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3532 || glyph_row->exact_window_width_line_p |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3533 /* Can't use this method if the line overlaps others or is |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3534 overlapped by others because these other lines would |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3535 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3536 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3537 || glyph_row->overlapped_p)) |
25012 | 3538 /* Can't do it for partial width windows on terminal frames |
3539 because we can't clear to eol in such a window. */ | |
3540 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3541 return 0; | |
3542 | |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3543 /* If we can't insert glyphs, we can use this method only |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3544 at the end of a line. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3545 if (!FRAME_CHAR_INS_DEL_OK (f)) |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3546 if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n') |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3547 return 0; |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3548 |
25012 | 3549 /* Set up a display iterator structure for W. Glyphs will be |
3550 produced in scratch_glyph_row. Current position is W's cursor | |
3551 position. */ | |
3552 clear_glyph_row (&scratch_glyph_row); | |
3553 SET_TEXT_POS (pos, PT, PT_BYTE); | |
28361
eccb57c44da5
(direct_output_for_insert): Use DEC_TEXT_POS
Gerd Moellmann <gerd@gnu.org>
parents:
27968
diff
changeset
|
3554 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3555 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3556 DEFAULT_FACE_ID); | |
3557 | |
3558 glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3559 if (glyph_row->mouse_face_p) |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3560 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3561 |
25012 | 3562 /* Give up if highlighting trailing whitespace and we have trailing |
3563 whitespace in glyph_row. We would have to remove the trailing | |
3564 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3565 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3566 && glyph_row->used[TEXT_AREA]) |
3567 { | |
3568 struct glyph *last; | |
3569 | |
3570 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3571 if (last->type == STRETCH_GLYPH | |
3572 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3573 && last->u.ch == ' ')) |
25012 | 3574 return 0; |
3575 } | |
3576 | |
3577 /* Give up if there are overlay strings at pos. This would fail | |
3578 if the overlay string has newlines in it. */ | |
3579 if (STRINGP (it.string)) | |
3580 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3581 |
25012 | 3582 it.hpos = w->cursor.hpos; |
3583 it.vpos = w->cursor.vpos; | |
3584 it.current_x = w->cursor.x + it.first_visible_x; | |
3585 it.current_y = w->cursor.y; | |
3586 it.end_charpos = PT; | |
3587 it.stop_charpos = min (PT, it.stop_charpos); | |
39226
d86fe98ee7d5
(direct_output_for_insert): Don't change IT's
Gerd Moellmann <gerd@gnu.org>
parents:
38988
diff
changeset
|
3588 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
25012 | 3589 |
3590 /* More than one display element may be returned for PT - 1 if | |
3591 (i) it's a control character which is translated into `\003' or | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3592 `^C', or (ii) it has a display table entry, or (iii) it's a |
25012 | 3593 combination of both. */ |
3594 delta = delta_bytes = 0; | |
3595 while (get_next_display_element (&it)) | |
3596 { | |
3597 PRODUCE_GLYPHS (&it); | |
3598 | |
3599 /* Give up if glyph doesn't fit completely on the line. */ | |
3600 if (it.current_x >= it.last_visible_x) | |
3601 return 0; | |
3602 | |
3603 /* Give up if new glyph has different ascent or descent than | |
3604 the original row, or if it is not a character glyph. */ | |
3605 if (glyph_row->ascent != it.ascent | |
3606 || glyph_row->height != it.ascent + it.descent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3607 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3608 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3609 || it.what != IT_CHARACTER) |
3610 return 0; | |
3611 | |
3612 delta += 1; | |
3613 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3614 set_iterator_to_next (&it, 1); |
25012 | 3615 } |
3616 | |
3617 /* Give up if we hit the right edge of the window. We would have | |
3618 to insert truncation or continuation glyphs. */ | |
3619 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3620 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3621 return 0; |
3622 | |
25012 | 3623 /* Give up if there is a \t following in the line. */ |
3624 it2 = it; | |
3625 it2.end_charpos = ZV; | |
3626 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3627 while (get_next_display_element (&it2) | |
3628 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3629 { | |
3630 if (it2.c == '\t') | |
3631 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3632 set_iterator_to_next (&it2, 1); |
25012 | 3633 } |
3634 | |
3635 /* Number of new glyphs produced. */ | |
3636 n = it.glyph_row->used[TEXT_AREA]; | |
3637 | |
3638 /* Start and end of glyphs in original row. */ | |
3639 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3640 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3641 | |
3642 /* Make room for new glyphs, then insert them. */ | |
3643 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3644 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3645 (end - glyphs - n) * sizeof (*end)); |
25012 | 3646 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3647 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3648 end - glyph_row->glyphs[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3649 |
25012 | 3650 /* Compute new line width. */ |
3651 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3652 end = glyph + glyph_row->used[TEXT_AREA]; | |
3653 glyph_row->pixel_width = glyph_row->x; | |
3654 while (glyph < end) | |
3655 { | |
3656 glyph_row->pixel_width += glyph->pixel_width; | |
3657 ++glyph; | |
3658 } | |
3659 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3660 /* Increment buffer positions for glyphs following the newly |
25012 | 3661 inserted ones. */ |
3662 for (glyph = glyphs + n; glyph < end; ++glyph) | |
26546
0f43cc91d6a5
(direct_output_for_insert): Increment glyph positions
Gerd Moellmann <gerd@gnu.org>
parents:
26499
diff
changeset
|
3663 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3664 glyph->charpos += delta; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3665 |
25012 | 3666 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
3667 { | |
3668 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3669 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3670 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3671 |
25012 | 3672 /* Adjust positions in lines following the one we are in. */ |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3673 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3674 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3675 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3676 delta, delta_bytes); |
25012 | 3677 |
3678 glyph_row->contains_overlapping_glyphs_p | |
3679 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3680 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3681 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3682 w->window_end_vpos = make_number (max (w->cursor.vpos, |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3683 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3684 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3685 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3686 highlight_trailing_whitespace (it.f, glyph_row); |
3687 | |
3688 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3689 In the middle, we have to insert glyphs. Note that this is now | |
3690 implemented for X frames. The implementation uses updated_window | |
3691 and updated_row. */ | |
3692 updated_row = glyph_row; | |
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3693 updated_area = TEXT_AREA; |
25012 | 3694 update_begin (f); |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3695 if (FRAME_RIF (f)) |
25012 | 3696 { |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3697 FRAME_RIF (f)->update_window_begin_hook (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3698 |
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3699 if (glyphs == end - n |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3700 /* In front of a space added by append_space. */ |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3701 || (glyphs == end - n - 1 |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3702 && (end - n)->charpos <= 0)) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3703 FRAME_RIF (f)->write_glyphs (glyphs, n); |
25012 | 3704 else |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3705 FRAME_RIF (f)->insert_glyphs (glyphs, n); |
25012 | 3706 } |
3707 else | |
3708 { | |
3709 if (glyphs == end - n) | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3710 write_glyphs (f, glyphs, n); |
25012 | 3711 else |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3712 insert_glyphs (f, glyphs, n); |
25012 | 3713 } |
3714 | |
3715 w->cursor.hpos += n; | |
3716 w->cursor.x = it.current_x - it.first_visible_x; | |
3717 xassert (w->cursor.hpos >= 0 | |
3718 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3719 | |
3720 /* How to set the cursor differs depending on whether we are | |
3721 using a frame matrix or a window matrix. Note that when | |
3722 a frame matrix is used, cursor_to expects frame coordinates, | |
3723 and the X and Y parameters are not used. */ | |
3724 if (window_redisplay_p) | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3725 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3726 w->cursor.y, w->cursor.x); |
25012 | 3727 else |
3728 { | |
3729 int x, y; | |
3730 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3731 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3732 ? XFASTINT (w->left_margin_cols) |
25012 | 3733 : 0)); |
3734 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3735 cursor_to (f, y, x); |
25012 | 3736 } |
3737 | |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3738 #ifdef HAVE_WINDOW_SYSTEM |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3739 update_window_fringes (w, 0); |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3740 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3741 |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3742 if (FRAME_RIF (f)) |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3743 FRAME_RIF (f)->update_window_end_hook (w, 1, 0); |
25012 | 3744 update_end (f); |
3745 updated_row = NULL; | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3746 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3747 fflush (FRAME_TTY (f)->output); |
25012 | 3748 |
3749 TRACE ((stderr, "direct output for insert\n")); | |
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3750 mark_window_display_accurate (it.window, 1); |
25012 | 3751 redisplay_performed_directly_p = 1; |
314 | 3752 return 1; |
3753 } | |
3754 | |
25012 | 3755 |
3756 /* Perform a direct display update for moving PT by N positions | |
3757 left or right. N < 0 means a movement backwards. This function | |
3758 is currently only called for N == 1 or N == -1. */ | |
3759 | |
314 | 3760 int |
3761 direct_output_forward_char (n) | |
3762 int n; | |
3763 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3764 struct frame *f = SELECTED_FRAME (); |
25012 | 3765 struct window *w = XWINDOW (selected_window); |
3766 struct glyph_row *row; | |
3767 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3768 /* Give up if point moved out of or into a composition. */ |
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
3769 if (check_point_in_composition (current_buffer, XINT (w->last_point), |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3770 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3771 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3772 |
25012 | 3773 /* Give up if face attributes have been changed. */ |
3774 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3775 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3776 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3777 /* Give up if current matrix is not up to date or we are |
25012 | 3778 displaying a message. */ |
3779 if (!display_completed || cursor_in_echo_area) | |
3780 return 0; | |
3781 | |
3782 /* Give up if the buffer's direction is reversed. */ | |
3783 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3784 return 0; |
11096
cac0367b1794
(direct_output_forward_char): Don't use direct output at an overlay boundary.
Karl Heuer <kwzh@gnu.org>
parents:
10770
diff
changeset
|
3785 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3786 /* 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
|
3787 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
|
3788 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3789 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3790 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3791 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3792 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3793 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3794 /* Give up if we are showing a message or just cleared the message |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3795 because we might need to resize the echo area window. */ |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3796 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1])) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3797 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3798 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3799 /* Give up if currently displaying a message instead of the |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3800 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3801 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3802 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3803 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3804 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3805 /* Give up if we don't know where the cursor is. */ |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3806 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3807 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3808 |
25012 | 3809 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3810 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3811 /* Give up if PT is outside of the last known cursor row. */ |
41069
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3812 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3813 || PT >= MATRIX_ROW_END_CHARPOS (row)) |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
3814 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3815 |
25012 | 3816 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3817 |
25012 | 3818 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3819 XSETFASTINT (w->last_point, PT); |
25012 | 3820 |
3821 xassert (w->cursor.hpos >= 0 | |
3822 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3823 |
25012 | 3824 if (FRAME_WINDOW_P (f)) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3825 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3826 w->cursor.y, w->cursor.x); |
25012 | 3827 else |
3828 { | |
3829 int x, y; | |
3830 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3831 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3832 ? XFASTINT (w->left_margin_cols) |
25012 | 3833 : 0)); |
3834 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3835 cursor_to (f, y, x); |
25012 | 3836 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3837 |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3838 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3839 fflush (FRAME_TTY (f)->output); |
25012 | 3840 redisplay_performed_directly_p = 1; |
314 | 3841 return 1; |
3842 } | |
25012 | 3843 |
3844 | |
314 | 3845 |
25012 | 3846 /*********************************************************************** |
3847 Frame Update | |
3848 ***********************************************************************/ | |
3849 | |
3850 /* Update frame F based on the data in desired matrices. | |
3851 | |
3852 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3853 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3854 scrolling. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3855 |
25012 | 3856 Value is non-zero if redisplay was stopped due to pending input. */ |
314 | 3857 |
3858 int | |
25012 | 3859 update_frame (f, force_p, inhibit_hairy_id_p) |
3860 struct frame *f; | |
3861 int force_p; | |
3862 int inhibit_hairy_id_p; | |
3863 { | |
3864 /* 1 means display has been paused because of pending input. */ | |
3865 int paused_p; | |
3866 struct window *root_window = XWINDOW (f->root_window); | |
3867 | |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3868 if (redisplay_dont_pause) |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3869 force_p = 1; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3870 #if PERIODIC_PREEMPTION_CHECKING |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3871 else if (NILP (Vredisplay_preemption_period)) |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3872 force_p = 1; |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3873 else if (!force_p && NUMBERP (Vredisplay_preemption_period)) |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3874 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3875 EMACS_TIME tm; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3876 double p = XFLOATINT (Vredisplay_preemption_period); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3877 int sec, usec; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3878 |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3879 if (detect_input_pending_ignore_squeezables ()) |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3880 { |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3881 paused_p = 1; |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3882 goto do_pause; |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3883 } |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3884 |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3885 sec = (int) p; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3886 usec = (p - sec) * 1000000; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3887 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3888 EMACS_GET_TIME (tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3889 EMACS_SET_SECS_USECS (preemption_period, sec, usec); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3890 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3891 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3892 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3893 |
25012 | 3894 if (FRAME_WINDOW_P (f)) |
3895 { | |
3896 /* We are working on window matrix basis. All windows whose | |
3897 flag must_be_updated_p is set have to be updated. */ | |
3898 | |
3899 /* Record that we are not working on frame matrices. */ | |
3900 set_frame_matrix_frame (NULL); | |
3901 | |
3902 /* Update all windows in the window tree of F, maybe stopping | |
3903 when pending input is detected. */ | |
3904 update_begin (f); | |
3905 | |
3906 /* Update the menu bar on X frames that don't have toolkit | |
3907 support. */ | |
3908 if (WINDOWP (f->menu_bar_window)) | |
3909 update_window (XWINDOW (f->menu_bar_window), 1); | |
3910 | |
3911 /* Update the tool-bar window, if present. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3912 if (WINDOWP (f->tool_bar_window)) |
25012 | 3913 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3914 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3915 |
3916 /* Update tool-bar window. */ | |
3917 if (w->must_be_updated_p) | |
3918 { | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3919 Lisp_Object tem; |
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3920 |
25012 | 3921 update_window (w, 1); |
3922 w->must_be_updated_p = 0; | |
3923 | |
3924 /* Swap tool-bar strings. We swap because we want to | |
3925 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3926 tem = f->current_tool_bar_string; |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3927 f->current_tool_bar_string = f->desired_tool_bar_string; |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3928 f->desired_tool_bar_string = tem; |
25012 | 3929 } |
3930 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3931 |
25012 | 3932 |
3933 /* Update windows. */ | |
3934 paused_p = update_window_tree (root_window, force_p); | |
3935 update_end (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3936 |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3937 /* This flush is a performance bottleneck under X, |
83037 | 3938 and it doesn't seem to be necessary anyway (in general). |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3939 It is necessary when resizing the window with the mouse, or |
83037 | 3940 at least the fringes are not redrawn in a timely manner. ++kfs */ |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3941 if (f->force_flush_display_p) |
83037 | 3942 { |
3943 FRAME_RIF (f)->flush_display (f); | |
3944 f->force_flush_display_p = 0; | |
3945 } | |
25012 | 3946 } |
3947 else | |
3948 { | |
3949 /* We are working on frame matrix basis. Set the frame on whose | |
3950 frame matrix we operate. */ | |
3951 set_frame_matrix_frame (f); | |
3952 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3953 /* Build F's desired matrix from window matrices. */ |
25012 | 3954 build_frame_matrix (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3955 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3956 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3957 update_begin (f); |
25012 | 3958 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3959 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3960 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3961 if (FRAME_TERMCAP_P (f)) |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3962 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3963 if (FRAME_TTY (f)->termscript) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3964 fflush (FRAME_TTY (f)->termscript); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3965 fflush (FRAME_TTY (f)->output); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3966 } |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3967 |
25012 | 3968 /* Check window matrices for lost pointers. */ |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
3969 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3970 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3971 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3972 #endif |
25012 | 3973 } |
3974 | |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3975 do_pause: |
25012 | 3976 /* Reset flags indicating that a window should be updated. */ |
3977 set_window_update_flags (root_window, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3978 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3979 display_completed = !paused_p; |
25012 | 3980 return paused_p; |
3981 } | |
3982 | |
3983 | |
3984 | |
3985 /************************************************************************ | |
3986 Window-based updates | |
3987 ************************************************************************/ | |
3988 | |
3989 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3990 don't stop updating when input is pending. */ | |
3991 | |
3992 static int | |
3993 update_window_tree (w, force_p) | |
3994 struct window *w; | |
3995 int force_p; | |
3996 { | |
3997 int paused_p = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3998 |
25012 | 3999 while (w && !paused_p) |
4000 { | |
4001 if (!NILP (w->hchild)) | |
4002 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
4003 else if (!NILP (w->vchild)) | |
4004 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
4005 else if (w->must_be_updated_p) | |
4006 paused_p |= update_window (w, force_p); | |
4007 | |
4008 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
4009 } | |
4010 | |
4011 return paused_p; | |
4012 } | |
4013 | |
4014 | |
4015 /* Update window W if its flag must_be_updated_p is non-zero. If | |
4016 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
4017 | |
4018 void | |
4019 update_single_window (w, force_p) | |
4020 struct window *w; | |
4021 int force_p; | |
4022 { | |
4023 if (w->must_be_updated_p) | |
4024 { | |
4025 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
4026 | |
4027 /* Record that this is not a frame-based redisplay. */ | |
4028 set_frame_matrix_frame (NULL); | |
4029 | |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4030 if (redisplay_dont_pause) |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4031 force_p = 1; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4032 #if PERIODIC_PREEMPTION_CHECKING |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4033 else if (NILP (Vredisplay_preemption_period)) |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4034 force_p = 1; |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4035 else if (!force_p && NUMBERP (Vredisplay_preemption_period)) |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4036 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4037 EMACS_TIME tm; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4038 double p = XFLOATINT (Vredisplay_preemption_period); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4039 int sec, usec; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4040 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4041 sec = (int) p; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4042 usec = (p - sec) * 1000000; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4043 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4044 EMACS_GET_TIME (tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4045 EMACS_SET_SECS_USECS (preemption_period, sec, usec); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4046 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4047 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4048 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4049 |
25012 | 4050 /* Update W. */ |
4051 update_begin (f); | |
4052 update_window (w, force_p); | |
4053 update_end (f); | |
4054 | |
4055 /* Reset flag in W. */ | |
4056 w->must_be_updated_p = 0; | |
4057 } | |
4058 } | |
4059 | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4060 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 4061 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4062 /* Redraw lines from the current matrix of window W that are |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4063 overlapped by other rows. YB is bottom-most y-position in W. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4064 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4065 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4066 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4067 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4068 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4069 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
4070 int i; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4071 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4072 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4073 /* If rows overlapping others have been changed, the rows being |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4074 overlapped have to be redrawn. This won't draw lines that have |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4075 already been drawn in update_window_line because overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4076 desired rows is 0, so after row assignment overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4077 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4078 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4079 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4080 struct glyph_row *row = w->current_matrix->rows + i; |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4081 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4082 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4083 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4084 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4085 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4086 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4087 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4088 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4089 enum glyph_row_area area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4090 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4091 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4092 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4093 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4094 updated_area = area; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4095 FRAME_RIF (f)->cursor_to (i, 0, row->y, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4096 area == TEXT_AREA ? row->x : 0); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4097 if (row->used[area]) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4098 FRAME_RIF (f)->write_glyphs (row->glyphs[area], |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4099 row->used[area]); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4100 FRAME_RIF (f)->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4101 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4102 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4103 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4104 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4105 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4106 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4107 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4108 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4109 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4110 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4111 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4112 /* Redraw lines from the current matrix of window W that overlap |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4113 others. YB is bottom-most y-position in W. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4114 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4115 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4116 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4117 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4118 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4119 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4120 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4121 struct glyph_row *row; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4122 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4123 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4124 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4125 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4126 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4127 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4128 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4129 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4130 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4131 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4132 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4133 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4134 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4135 if (row->overlapping_p && i > 0 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4136 { |
65890
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4137 int overlaps = 0; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4138 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4139 if (MATRIX_ROW_OVERLAPS_PRED_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4140 && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4141 overlaps |= OVERLAPS_PRED; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4142 if (MATRIX_ROW_OVERLAPS_SUCC_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4143 && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4144 overlaps |= OVERLAPS_SUCC; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4145 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4146 if (overlaps) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4147 { |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4148 if (row->used[LEFT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4149 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4150 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4151 if (row->used[TEXT_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4152 rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4153 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4154 if (row->used[RIGHT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4155 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4156 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4157 /* Record in neighbour rows that ROW overwrites part of |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4158 their display. */ |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4159 if (overlaps & OVERLAPS_PRED) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4160 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4161 if (overlaps & OVERLAPS_SUCC) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4162 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4163 } |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4164 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4165 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4166 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4167 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4168 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4169 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4170 |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4171 #endif /* HAVE_WINDOW_SYSTEM */ |
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4172 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4173 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4174 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4175 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4176 /* Check that no row in the current matrix of window W is enabled |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4177 which is below what's displayed in the window. */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4178 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4179 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4180 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4181 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4182 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4183 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4184 int i, yb = window_text_bottom_y (w); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4185 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4186 for (i = 0; i < w->current_matrix->nrows - 1; ++i) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4187 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4188 struct glyph_row *row = MATRIX_ROW (w->current_matrix, i); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4189 if (!last_seen_p && MATRIX_ROW_BOTTOM_Y (row) >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4190 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4191 else if (last_seen_p && row->enabled_p) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4192 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4193 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4194 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4195 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4196 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4197 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4198 |
25012 | 4199 /* Update display of window W. FORCE_P non-zero means that we should |
4200 not stop when detecting pending input. */ | |
4201 | |
4202 static int | |
4203 update_window (w, force_p) | |
4204 struct window *w; | |
4205 int force_p; | |
4206 { | |
4207 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4208 int paused_p; | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4209 #if !PERIODIC_PREEMPTION_CHECKING |
25012 | 4210 int preempt_count = baud_rate / 2400 + 1; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4211 #endif |
25012 | 4212 extern int input_pending; |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4213 extern Lisp_Object do_mouse_tracking; |
83241
3dcba0bc766b
Merged in changes from CVS trunk. (Long time no see!) :-)
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
4214 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4215 #if GLYPH_DEBUG |
25012 | 4216 /* Check that W's frame doesn't have glyph matrices. */ |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
4217 xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w)))); |
59879
aaf00c303308
* dispnew.c (update_window): Fixing compile error due to
Steven Tamm <steventamm@mac.com>
parents:
59592
diff
changeset
|
4218 #endif |
25012 | 4219 |
4220 /* Check pending input the first time so that we can quickly return. */ | |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4221 #if !PERIODIC_PREEMPTION_CHECKING |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4222 if (!force_p) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4223 detect_input_pending_ignore_squeezables (); |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4224 #endif |
25012 | 4225 |
4226 /* If forced to complete the update, or if no input is pending, do | |
4227 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4228 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 4229 { |
4230 struct glyph_row *row, *end; | |
4231 struct glyph_row *mode_line_row; | |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4232 struct glyph_row *header_line_row; |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4233 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4234 |
4235 rif->update_window_begin_hook (w); | |
4236 yb = window_text_bottom_y (w); | |
4237 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4238 /* If window has a header line, update it before everything else. |
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4239 Adjust y-positions of other rows by the header line height. */ |
25012 | 4240 row = desired_matrix->rows; |
4241 end = row + desired_matrix->nrows - 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4242 |
25012 | 4243 if (row->mode_line_p) |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4244 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4245 header_line_row = row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4246 ++row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4247 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4248 else |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4249 header_line_row = NULL; |
25012 | 4250 |
4251 /* Update the mode line, if necessary. */ | |
4252 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4253 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4254 { | |
4255 mode_line_row->y = yb; | |
4256 update_window_line (w, MATRIX_ROW_VPOS (mode_line_row, | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4257 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4258 &mouse_face_overwritten_p); |
25012 | 4259 } |
4260 | |
4261 /* Find first enabled row. Optimizations in redisplay_internal | |
4262 may lead to an update with only one row enabled. There may | |
4263 be also completely empty matrices. */ | |
4264 while (row < end && !row->enabled_p) | |
4265 ++row; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4266 |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4267 /* Try reusing part of the display by copying. */ |
25012 | 4268 if (row < end && !desired_matrix->no_scrolling_p) |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4269 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4270 int rc = scrolling_window (w, header_line_row != NULL); |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4271 if (rc < 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4272 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4273 /* All rows were found to be equal. */ |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4274 paused_p = 0; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4275 goto set_cursor; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4276 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4277 else if (rc > 0) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4278 { |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4279 /* We've scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4280 force_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4281 changed_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4282 } |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4283 } |
25012 | 4284 |
4285 /* Update the rest of the lines. */ | |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4286 for (n_updated = 0; row < end && (force_p || !input_pending); ++row) |
31653
2554afbeb88d
(update_window): Make sure to make desired rows
Gerd Moellmann <gerd@gnu.org>
parents:
31295
diff
changeset
|
4287 if (row->enabled_p) |
25012 | 4288 { |
4289 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4290 int i; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4291 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4292 /* We'll have to play a little bit with when to |
25012 | 4293 detect_input_pending. If it's done too often, |
4294 scrolling large windows with repeated scroll-up | |
4295 commands will too quickly pause redisplay. */ | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4296 #if PERIODIC_PREEMPTION_CHECKING |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4297 if (!force_p) |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4298 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4299 EMACS_TIME tm, dif; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4300 EMACS_GET_TIME (tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4301 EMACS_SUB_TIME (dif, preemption_next_check, tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4302 if (EMACS_TIME_NEG_P (dif)) |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4303 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4304 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period); |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
4305 if (detect_input_pending_ignore_squeezables ()) |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
4306 break; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4307 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4308 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4309 #else |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4310 if (!force_p && ++n_updated % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4311 detect_input_pending_ignore_squeezables (); |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4312 #endif |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4313 changed_p |= update_window_line (w, vpos, |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4314 &mouse_face_overwritten_p); |
25012 | 4315 |
4316 /* Mark all rows below the last visible one in the current | |
4317 matrix as invalid. This is necessary because of | |
4318 variable line heights. Consider the case of three | |
4319 successive redisplays, where the first displays 5 | |
4320 lines, the second 3 lines, and the third 5 lines again. | |
4321 If the second redisplay wouldn't mark rows in the | |
4322 current matrix invalid, the third redisplay might be | |
4323 tempted to optimize redisplay based on lines displayed | |
4324 in the first redisplay. */ | |
4325 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4326 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4327 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4328 } | |
4329 | |
4330 /* Was display preempted? */ | |
4331 paused_p = row < end; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4332 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4333 set_cursor: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4334 |
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4335 /* Update the header line after scrolling because a new header |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4336 line would otherwise overwrite lines at the top of the window |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4337 that can be scrolled. */ |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4338 if (header_line_row && header_line_row->enabled_p) |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4339 { |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4340 header_line_row->y = 0; |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4341 update_window_line (w, 0, &mouse_face_overwritten_p); |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4342 } |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4343 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4344 /* Fix the appearance of overlapping/overlapped rows. */ |
25012 | 4345 if (!paused_p && !w->pseudo_window_p) |
4346 { | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4347 #ifdef HAVE_WINDOW_SYSTEM |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4348 if (changed_p && rif->fix_overlapping_area) |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4349 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4350 redraw_overlapped_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4351 redraw_overlapping_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4352 } |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4353 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4354 |
25012 | 4355 /* Make cursor visible at cursor position of W. */ |
4356 set_window_cursor_after_update (w); | |
4357 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4358 #if 0 /* Check that current matrix invariants are satisfied. This is |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4359 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4360 IF_DEBUG (check_matrix_invariants (w)); |
4361 #endif | |
4362 } | |
4363 | |
4364 #if GLYPH_DEBUG | |
4365 /* Remember the redisplay method used to display the matrix. */ | |
4366 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4367 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4368 |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4369 #ifdef HAVE_WINDOW_SYSTEM |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4370 update_window_fringes (w, 0); |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4371 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4372 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4373 /* End the update of window W. Don't set the cursor if we |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4374 paused updating the display because in this case, |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4375 set_window_cursor_after_update hasn't been called, and |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4376 output_cursor doesn't contain the cursor location. */ |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4377 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
25012 | 4378 } |
4379 else | |
4380 paused_p = 1; | |
4381 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4382 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4383 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4384 add_window_display_history (w, w->current_matrix->method, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4385 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4386 |
25012 | 4387 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4388 |
25012 | 4389 return paused_p; |
4390 } | |
4391 | |
4392 | |
4393 /* Update the display of area AREA in window W, row number VPOS. | |
4394 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4395 | |
4396 static void | |
4397 update_marginal_area (w, area, vpos) | |
4398 struct window *w; | |
4399 int area, vpos; | |
4400 { | |
4401 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4402 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4403 |
4404 /* Let functions in xterm.c know what area subsequent X positions | |
4405 will be relative to. */ | |
4406 updated_area = area; | |
4407 | |
4408 /* Set cursor to start of glyphs, write them, and clear to the end | |
4409 of the area. I don't think that something more sophisticated is | |
4410 necessary here, since marginal areas will not be the default. */ | |
4411 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4412 if (desired_row->used[area]) | |
4413 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4414 rif->clear_end_of_line (-1); | |
4415 } | |
4416 | |
4417 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4418 /* Update the display of the text area of row VPOS in window W. |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4419 Value is non-zero if display has changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4420 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4421 static int |
25012 | 4422 update_text_area (w, vpos) |
4423 struct window *w; | |
4424 int vpos; | |
314 | 4425 { |
25012 | 4426 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4427 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4428 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4429 int changed_p = 0; |
25012 | 4430 |
4431 /* Let functions in xterm.c know what area subsequent X positions | |
4432 will be relative to. */ | |
4433 updated_area = TEXT_AREA; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4434 |
25012 | 4435 /* If rows are at different X or Y, or rows have different height, |
4436 or the current row is marked invalid, write the entire line. */ | |
4437 if (!current_row->enabled_p | |
4438 || desired_row->y != current_row->y | |
4439 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4440 || desired_row->phys_ascent != current_row->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4441 || desired_row->phys_height != current_row->phys_height |
25012 | 4442 || desired_row->visible_height != current_row->visible_height |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4443 || current_row->overlapped_p |
75371
7267980a2f42
* dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
4444 /* This next line is necessary for correctly redrawing |
7267980a2f42
* dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
4445 mouse-face areas after scrolling and other operations. |
7267980a2f42
* dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
4446 However, it causes excessive flickering when mouse is moved |
7267980a2f42
* dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
4447 across the mode line. Luckily, turning it off for the mode |
76069
898ccefda9ce
(update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents:
76065
diff
changeset
|
4448 line doesn't seem to hurt anything. -- cyd. |
898ccefda9ce
(update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents:
76065
diff
changeset
|
4449 But it is still needed for the header line. -- kfs. */ |
898ccefda9ce
(update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents:
76065
diff
changeset
|
4450 || (current_row->mouse_face_p |
898ccefda9ce
(update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents:
76065
diff
changeset
|
4451 && !(current_row->mode_line_p && vpos > 0)) |
25012 | 4452 || current_row->x != desired_row->x) |
4453 { | |
4454 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4455 |
25012 | 4456 if (desired_row->used[TEXT_AREA]) |
4457 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4458 desired_row->used[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4459 |
25012 | 4460 /* Clear to end of window. */ |
4461 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4462 changed_p = 1; |
44815
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4463 |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4464 /* This erases the cursor. We do this here because |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4465 notice_overwritten_cursor cannot easily check this, which |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4466 might indicate that the whole functionality of |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4467 notice_overwritten_cursor would better be implemented here. |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4468 On the other hand, we need notice_overwritten_cursor as long |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4469 as mouse highlighting is done asynchronously outside of |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4470 redisplay. */ |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4471 if (vpos == w->phys_cursor.vpos) |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4472 w->phys_cursor_on_p = 0; |
25012 | 4473 } |
4474 else | |
4475 { | |
4476 int stop, i, x; | |
4477 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4478 struct glyph *desired_glyph = desired_row->glyphs[TEXT_AREA]; | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4479 int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p; |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4480 int desired_stop_pos = desired_row->used[TEXT_AREA]; |
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4481 |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4482 /* If the desired row extends its face to the text area end, and |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4483 unless the current row also does so at the same position, |
25012 | 4484 make sure we write at least one glyph, so that the face |
4485 extension actually takes place. */ | |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4486 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row) |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4487 && (desired_stop_pos < current_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4488 || (desired_stop_pos == current_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4489 && !MATRIX_ROW_EXTENDS_FACE_P (current_row)))) |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4490 --desired_stop_pos; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4491 |
25012 | 4492 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
4493 i = 0; | |
4494 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4495 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4496 /* Loop over glyphs that current and desired row may have |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4497 in common. */ |
25012 | 4498 while (i < stop) |
4499 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4500 int can_skip_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4501 |
25012 | 4502 /* Skip over glyphs that both rows have in common. These |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4503 don't have to be written. We can't skip if the last |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4504 current glyph overlaps the glyph to its right. For |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4505 example, consider a current row of `if ' with the `f' in |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4506 Courier bold so that it overlaps the ` ' to its right. |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4507 If the desired row is ` ', we would skip over the space |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4508 after the `if' and there would remain a pixel from the |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4509 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4510 if (overlapping_glyphs_p && i > 0) |
25012 | 4511 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4512 struct glyph *glyph = ¤t_row->glyphs[TEXT_AREA][i - 1]; |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4513 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4514 |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4515 rif->get_glyph_overhangs (glyph, XFRAME (w->frame), |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4516 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4517 can_skip_p = right == 0; |
25012 | 4518 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4519 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4520 if (can_skip_p) |
25012 | 4521 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4522 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4523 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4524 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4525 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4526 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4527 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4528 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4529 /* Consider the case that the current row contains "xxx |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4530 ppp ggg" in italic Courier font, and the desired row |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4531 is "xxx ggg". The character `p' has lbearing, `g' |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4532 has not. The loop above will stop in front of the |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4533 first `p' in the current row. If we would start |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4534 writing glyphs there, we wouldn't erase the lbearing |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4535 of the `p'. The rest of the lbearing problem is then |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
4536 taken care of by draw_glyphs. */ |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4537 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4538 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4539 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4540 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4541 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4542 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4543 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4544 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4545 rif->get_glyph_overhangs (current_glyph, XFRAME (w->frame), |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4546 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4547 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4548 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4549 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4550 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4551 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4552 } |
25012 | 4553 } |
4554 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4555 |
25012 | 4556 /* Try to avoid writing the entire rest of the desired row |
4557 by looking for a resync point. This mainly prevents | |
4558 mode line flickering in the case the mode line is in | |
4559 fixed-pitch font, which it usually will be. */ | |
4560 if (i < desired_row->used[TEXT_AREA]) | |
4561 { | |
4562 int start_x = x, start_hpos = i; | |
4563 struct glyph *start = desired_glyph; | |
4564 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4565 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4566 |
25012 | 4567 /* Find the next glyph that's equal again. */ |
4568 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4569 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4570 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4571 && x == current_x) |
4572 { | |
4573 x += desired_glyph->pixel_width; | |
4574 current_x += current_glyph->pixel_width; | |
4575 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4576 skip_first_p = 0; |
25012 | 4577 } |
4578 | |
4579 if (i == start_hpos || x != current_x) | |
4580 { | |
4581 i = start_hpos; | |
4582 x = start_x; | |
4583 desired_glyph = start; | |
4584 break; | |
4585 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4586 |
25012 | 4587 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4588 rif->write_glyphs (start, i - start_hpos); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4589 changed_p = 1; |
25012 | 4590 } |
4591 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4592 |
25012 | 4593 /* Write the rest. */ |
4594 if (i < desired_row->used[TEXT_AREA]) | |
4595 { | |
4596 rif->cursor_to (vpos, i, desired_row->y, x); | |
4597 rif->write_glyphs (desired_glyph, desired_row->used[TEXT_AREA] - i); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4598 changed_p = 1; |
25012 | 4599 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4600 |
25012 | 4601 /* Maybe clear to end of line. */ |
4602 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4603 { | |
4604 /* If new row extends to the end of the text area, nothing | |
4605 has to be cleared, if and only if we did a write_glyphs | |
4606 above. This is made sure by setting desired_stop_pos | |
4607 appropriately above. */ | |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4608 xassert (i < desired_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4609 || ((desired_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4610 == current_row->used[TEXT_AREA]) |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4611 && MATRIX_ROW_EXTENDS_FACE_P (current_row))); |
25012 | 4612 } |
4613 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4614 { | |
4615 /* If old row extends to the end of the text area, clear. */ | |
4616 if (i >= desired_row->used[TEXT_AREA]) | |
4617 rif->cursor_to (vpos, i, desired_row->y, | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4618 desired_row->pixel_width); |
25012 | 4619 rif->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4620 changed_p = 1; |
25012 | 4621 } |
4622 else if (desired_row->pixel_width < current_row->pixel_width) | |
4623 { | |
4624 /* Otherwise clear to the end of the old row. Everything | |
4625 after that position should be clear already. */ | |
4626 int x; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4627 |
25012 | 4628 if (i >= desired_row->used[TEXT_AREA]) |
4629 rif->cursor_to (vpos, i, desired_row->y, | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4630 desired_row->pixel_width); |
25012 | 4631 |
4632 /* If cursor is displayed at the end of the line, make sure | |
4633 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4634 with which to erase the cursor (because this method | |
4635 doesn't work with lbearing/rbearing), so we must do it | |
4636 this way. */ | |
4637 if (vpos == w->phys_cursor.vpos | |
4638 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4639 { | |
4640 w->phys_cursor_on_p = 0; | |
4641 x = -1; | |
4642 } | |
4643 else | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4644 x = current_row->pixel_width; |
25012 | 4645 rif->clear_end_of_line (x); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4646 changed_p = 1; |
25012 | 4647 } |
4648 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4649 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4650 return changed_p; |
25012 | 4651 } |
4652 | |
4653 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4654 /* Update row VPOS in window W. Value is non-zero if display has been |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4655 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4656 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4657 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4658 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4659 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4660 int vpos, *mouse_face_overwritten_p; |
25012 | 4661 { |
4662 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4663 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4664 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4665 int changed_p = 0; |
25012 | 4666 |
4667 /* Set the row being updated. This is important to let xterm.c | |
4668 know what line height values are in effect. */ | |
4669 updated_row = desired_row; | |
4670 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4671 /* A row can be completely invisible in case a desired matrix was |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4672 built with a vscroll and then make_cursor_line_fully_visible shifts |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4673 the matrix. Make sure to make such rows current anyway, since |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4674 we need the correct y-position, for example, in the current matrix. */ |
31726
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4675 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4676 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4677 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4678 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4679 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4680 /* Update display of the left margin area, if there is one. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4681 if (!desired_row->full_width_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4682 && !NILP (w->left_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4683 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4684 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4685 update_marginal_area (w, LEFT_MARGIN_AREA, vpos); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4686 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4687 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4688 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4689 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4690 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4691 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4692 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4693 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4694 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4695 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4696 /* Update display of the right margin area, if there is one. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4697 if (!desired_row->full_width_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4698 && !NILP (w->right_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4699 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4700 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4701 update_marginal_area (w, RIGHT_MARGIN_AREA, vpos); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4702 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4703 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4704 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4705 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4706 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4707 || desired_row->visible_height != current_row->visible_height |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4708 || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
4709 || desired_row->overlay_arrow_bitmap != current_row->overlay_arrow_bitmap |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4710 || current_row->redraw_fringe_bitmaps_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4711 || desired_row->mode_line_p != current_row->mode_line_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4712 || desired_row->exact_window_width_line_p != current_row->exact_window_width_line_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4713 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4714 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4715 rif->after_update_window_line_hook (desired_row); |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4716 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4717 |
25012 | 4718 /* Update current_row from desired_row. */ |
4719 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4720 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4721 return changed_p; |
25012 | 4722 } |
4723 | |
4724 | |
4725 /* Set the cursor after an update of window W. This function may only | |
4726 be called from update_window. */ | |
4727 | |
4728 static void | |
4729 set_window_cursor_after_update (w) | |
4730 struct window *w; | |
4731 { | |
4732 struct frame *f = XFRAME (w->frame); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4733 struct redisplay_interface *rif = FRAME_RIF (f); |
25012 | 4734 int cx, cy, vpos, hpos; |
4735 | |
4736 /* Not intended for frame matrix updates. */ | |
4737 xassert (FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4738 |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4739 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4740 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4741 /* If we are showing a message instead of the mini-buffer, |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4742 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4743 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4744 && EQ (minibuf_window, echo_area_window) |
25012 | 4745 /* These cases apply only to the frame that contains |
4746 the active mini-buffer window. */ | |
4747 && FRAME_HAS_MINIBUF_P (f) | |
4748 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4749 { | |
4750 cx = cy = vpos = hpos = 0; | |
4751 | |
4752 if (cursor_in_echo_area >= 0) | |
4753 { | |
4754 /* If the mini-buffer is several lines high, find the last | |
4755 line that has any text on it. Note: either all lines | |
4756 are enabled or none. Otherwise we wouldn't be able to | |
4757 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4758 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4759 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4760 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4761 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4762 last_row = NULL; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4763 row = w->current_matrix->rows; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4764 while (row->enabled_p |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4765 && (last_row == NULL |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4766 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
25012 | 4767 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4768 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4769 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4770 last_row = row; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4771 ++row; |
25012 | 4772 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4773 |
25012 | 4774 if (last_row) |
4775 { | |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4776 struct glyph *start = last_row->glyphs[TEXT_AREA]; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4777 struct glyph *last = start + last_row->used[TEXT_AREA] - 1; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4778 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4779 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4780 --last; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4781 |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4782 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4783 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4784 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4785 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4786 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4787 |
25012 | 4788 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4789 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4790 } |
4791 } | |
4792 } | |
4793 else | |
4794 { | |
4795 cx = w->cursor.x; | |
4796 cy = w->cursor.y; | |
4797 hpos = w->cursor.hpos; | |
4798 vpos = w->cursor.vpos; | |
4799 } | |
4800 | |
4801 /* Window cursor can be out of sync for horizontally split windows. */ | |
4802 hpos = max (0, hpos); | |
4803 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4804 vpos = max (0, vpos); | |
4805 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4806 rif->cursor_to (vpos, hpos, cy, cx); | |
4807 } | |
4808 | |
4809 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4810 /* Set WINDOW->must_be_updated_p to ON_P for all windows in the window |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4811 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4812 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4813 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4814 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4815 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4816 int on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4817 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4818 while (w) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4819 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4820 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4821 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4822 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4823 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4824 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4825 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4826 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4827 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4828 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4829 } |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4830 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4831 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4832 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4833 /*********************************************************************** |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4834 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4835 ***********************************************************************/ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4836 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4837 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4838 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4839 struct row_entry |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4840 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4841 /* Number of occurrences of this row in desired and current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4842 int old_uses, new_uses; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4843 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4844 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4845 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4846 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4847 /* Bucket index of this row_entry in the hash table row_table. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4848 int bucket; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4849 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4850 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4851 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4852 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4853 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4854 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4855 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4856 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4857 /* A pool to allocate row_entry structures from, and the size of the |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4858 pool. The pool is reallocated in scrolling_window when we find |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4859 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4860 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4861 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4862 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4863 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4864 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4865 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4866 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4867 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4868 /* The hash table used during scrolling, and the table's size. This |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4869 table is used to quickly identify equal rows in the desired and |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4871 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4872 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4873 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4874 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4875 /* Vectors of pointers to row_entry structures belonging to the |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4876 current and desired matrix, and the size of the vectors. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4877 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4878 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4879 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4880 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4881 /* A pool to allocate run structures from, and its size. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4882 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4883 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4884 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4885 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4886 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4887 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4888 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4889 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4890 /* Add glyph row ROW to the scrolling hash table during the scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4891 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4892 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4893 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4894 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4895 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4896 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4897 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4898 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4899 int i = row->hash % row_table_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4900 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4901 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4902 while (entry && !row_equal_p (w, entry->row, row, 1)) |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4903 entry = entry->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4904 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4905 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4906 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4907 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4908 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4909 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4910 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4911 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4912 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4913 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4915 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4916 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4917 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4918 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4919 |
25012 | 4920 /* Try to reuse part of the current display of W by scrolling lines. |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4921 HEADER_LINE_P non-zero means W has a header line. |
25012 | 4922 |
4923 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4924 Technique for Isolating Differences Between Files." It should take | |
4925 O(N) time. | |
4926 | |
4927 A short outline of the steps of the algorithm | |
4928 | |
4929 1. Skip lines equal at the start and end of both matrices. | |
4930 | |
4931 2. Enter rows in the current and desired matrix into a symbol | |
4932 table, counting how often they appear in both matrices. | |
4933 | |
4934 3. Rows that appear exactly once in both matrices serve as anchors, | |
4935 i.e. we assume that such lines are likely to have been moved. | |
4936 | |
4937 4. Starting from anchor lines, extend regions to be scrolled both | |
4938 forward and backward. | |
4939 | |
4940 Value is | |
4941 | |
4942 -1 if all rows were found to be equal. | |
4943 0 to indicate that we did not scroll the display, or | |
4944 1 if we did scroll. */ | |
4945 | |
4946 static int | |
25546 | 4947 scrolling_window (w, header_line_p) |
25012 | 4948 struct window *w; |
25546 | 4949 int header_line_p; |
25012 | 4950 { |
4951 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4952 struct glyph_matrix *current_matrix = w->current_matrix; | |
4953 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4954 int i, j, first_old, first_new, last_old, last_new; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4955 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4956 struct row_entry *entry; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4957 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4958 |
4959 /* Skip over rows equal at the start. */ | |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4960 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4961 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4962 struct glyph_row *d = MATRIX_ROW (desired_matrix, i); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4963 struct glyph_row *c = MATRIX_ROW (current_matrix, i); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4964 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4965 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4966 && d->enabled_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4967 && !d->redraw_fringe_bitmaps_p |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4968 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4969 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4970 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4971 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4972 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4973 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4974 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4975 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4976 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4977 break; |
25012 | 4978 } |
4979 | |
4980 /* Give up if some rows in the desired matrix are not enabled. */ | |
4981 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4982 return -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4983 |
25012 | 4984 first_old = first_new = i; |
4985 | |
4986 /* Set last_new to the index + 1 of the last enabled row in the | |
4987 desired matrix. */ | |
4988 i = first_new + 1; | |
4989 while (i < desired_matrix->nrows - 1 | |
4990 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4991 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4992 ++i; |
4993 | |
4994 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4995 return 0; | |
4996 | |
4997 last_new = i; | |
4998 | |
4999 /* Set last_old to the index + 1 of the last enabled row in the | |
5000 current matrix. We don't look at the enabled flag here because | |
5001 we plan to reuse part of the display even if other parts are | |
5002 disabled. */ | |
5003 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5004 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5005 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5006 int bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (current_matrix, i)); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5007 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5008 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5009 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5010 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5011 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5012 |
25012 | 5013 last_old = i; |
5014 | |
5015 /* Skip over rows equal at the bottom. */ | |
5016 i = last_new; | |
5017 j = last_old; | |
5018 while (i - 1 > first_new | |
5019 && j - 1 > first_old | |
5020 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
5021 && (MATRIX_ROW (current_matrix, i - 1)->y | |
5022 == MATRIX_ROW (desired_matrix, j - 1)->y) | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5023 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
25012 | 5024 && row_equal_p (w, |
5025 MATRIX_ROW (desired_matrix, i - 1), | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
5026 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 5027 --i, --j; |
5028 last_new = i; | |
5029 last_old = j; | |
5030 | |
5031 /* Nothing to do if all rows are equal. */ | |
5032 if (last_new == first_new) | |
5033 return 0; | |
5034 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5035 /* Reallocate vectors, tables etc. if necessary. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5036 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5037 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5038 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5039 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5040 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5041 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5042 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5043 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5044 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5045 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5046 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5047 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5048 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5049 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5050 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5051 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5052 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5053 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5054 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5055 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5056 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5057 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5058 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5059 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5060 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5061 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5062 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5063 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5064 row_entry_pool = (struct row_entry *) xrealloc (row_entry_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5065 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5066 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5067 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5068 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5069 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5070 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5071 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5072 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5073 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5074 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5075 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5076 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5077 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5078 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5079 /* Add rows from the current and desired matrix to the hash table |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5080 row_hash_table to be able to find equal ones quickly. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5081 |
25012 | 5082 for (i = first_old; i < last_old; ++i) |
5083 { | |
5084 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
5085 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5086 entry = add_row_entry (w, MATRIX_ROW (current_matrix, i)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5087 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5088 ++entry->old_uses; |
25012 | 5089 } |
5090 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5091 old_lines[i] = NULL; |
25012 | 5092 } |
5093 | |
5094 for (i = first_new; i < last_new; ++i) | |
5095 { | |
5096 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5097 entry = add_row_entry (w, MATRIX_ROW (desired_matrix, i)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5098 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5099 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5100 new_lines[i] = entry; |
25012 | 5101 } |
5102 | |
5103 /* Identify moves based on lines that are unique and equal | |
5104 in both matrices. */ | |
5105 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5106 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5107 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5108 && old_lines[i]->new_uses == 1) |
25012 | 5109 { |
5110 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5111 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5112 struct run *run = run_pool + run_idx++; |
25012 | 5113 |
5114 /* Record move. */ | |
5115 run->current_vpos = i; | |
5116 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
5117 run->desired_vpos = new_line; | |
5118 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
5119 run->nrows = 1; | |
5120 run->height = MATRIX_ROW (current_matrix, i)->height; | |
5121 | |
5122 /* Extend backward. */ | |
5123 j = i - 1; | |
5124 k = new_line - 1; | |
5125 while (j > first_old | |
5126 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5127 && old_lines[j] == new_lines[k]) |
25012 | 5128 { |
5129 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5130 --run->current_vpos; |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5131 --run->desired_vpos; |
25012 | 5132 ++run->nrows; |
5133 run->height += h; | |
5134 run->desired_y -= h; | |
5135 run->current_y -= h; | |
5136 --j, --k; | |
5137 } | |
5138 | |
5139 /* Extend forward. */ | |
5140 j = i + 1; | |
5141 k = new_line + 1; | |
5142 while (j < last_old | |
5143 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5144 && old_lines[j] == new_lines[k]) |
25012 | 5145 { |
5146 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5147 ++run->nrows; |
25012 | 5148 run->height += h; |
5149 ++j, ++k; | |
5150 } | |
5151 | |
5152 /* Insert run into list of all runs. Order runs by copied | |
5153 pixel lines. Note that we record runs that don't have to | |
5154 be copied because they are already in place. This is done | |
5155 because we can avoid calling update_window_line in this | |
5156 case. */ | |
5157 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
5158 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
5159 for (k = nruns; k > j; --k) |
25012 | 5160 runs[k] = runs[k - 1]; |
5161 runs[j] = run; | |
5162 ++nruns; | |
5163 | |
5164 i += run->nrows; | |
5165 } | |
5166 else | |
5167 ++i; | |
5168 | |
5169 /* Do the moves. Do it in a way that we don't overwrite something | |
5170 we want to copy later on. This is not solvable in general | |
5171 because there is only one display and we don't have a way to | |
5172 exchange areas on this display. Example: | |
5173 | |
5174 +-----------+ +-----------+ | |
5175 | A | | B | | |
5176 +-----------+ --> +-----------+ | |
5177 | B | | A | | |
5178 +-----------+ +-----------+ | |
5179 | |
5180 Instead, prefer bigger moves, and invalidate moves that would | |
5181 copy from where we copied to. */ | |
5182 | |
5183 for (i = 0; i < nruns; ++i) | |
5184 if (runs[i]->nrows > 0) | |
5185 { | |
5186 struct run *r = runs[i]; | |
5187 | |
5188 /* Copy on the display. */ | |
5189 if (r->current_y != r->desired_y) | |
5190 { | |
5191 rif->scroll_run_hook (w, r); | |
5192 | |
5193 /* Invalidate runs that copy from where we copied to. */ | |
5194 for (j = i + 1; j < nruns; ++j) | |
5195 { | |
5196 struct run *p = runs[j]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5197 |
25012 | 5198 if ((p->current_y >= r->desired_y |
5199 && p->current_y < r->desired_y + r->height) | |
5200 || (p->current_y + p->height >= r->desired_y | |
5201 && (p->current_y + p->height | |
5202 < r->desired_y + r->height))) | |
5203 p->nrows = 0; | |
5204 } | |
5205 } | |
5206 | |
5207 /* Assign matrix rows. */ | |
5208 for (j = 0; j < r->nrows; ++j) | |
5209 { | |
5210 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5211 int to_overlapped_p; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
5212 |
25012 | 5213 to = MATRIX_ROW (current_matrix, r->desired_vpos + j); |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
5214 from = MATRIX_ROW (desired_matrix, r->desired_vpos + j); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5215 to_overlapped_p = to->overlapped_p; |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5216 if (!from->mode_line_p && !w->pseudo_window_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5217 && (to->left_fringe_bitmap != from->left_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5218 || to->right_fringe_bitmap != from->right_fringe_bitmap |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5219 || to->left_fringe_face_id != from->left_fringe_face_id |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5220 || to->right_fringe_face_id != from->right_fringe_face_id |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
5221 || to->overlay_arrow_bitmap != from->overlay_arrow_bitmap)) |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5222 from->redraw_fringe_bitmaps_p = 1; |
25012 | 5223 assign_row (to, from); |
5224 to->enabled_p = 1, from->enabled_p = 0; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5225 to->overlapped_p = to_overlapped_p; |
25012 | 5226 } |
5227 } | |
5228 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5229 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5230 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5231 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5232 |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5233 /* Value is > 0 to indicate that we scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5234 return nruns; |
25012 | 5235 } |
5236 | |
5237 | |
5238 | |
5239 /************************************************************************ | |
5240 Frame-Based Updates | |
5241 ************************************************************************/ | |
5242 | |
5243 /* Update the desired frame matrix of frame F. | |
5244 | |
5245 FORCE_P non-zero means that the update should not be stopped by | |
5246 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
5247 should not be tried. | |
5248 | |
5249 Value is non-zero if update was stopped due to pending input. */ | |
5250 | |
5251 static int | |
5252 update_frame_1 (f, force_p, inhibit_id_p) | |
5253 struct frame *f; | |
5254 int force_p; | |
5255 int inhibit_id_p; | |
5256 { | |
5257 /* Frame matrices to work on. */ | |
5258 struct glyph_matrix *current_matrix = f->current_matrix; | |
5259 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
5260 int i; | |
314 | 5261 int pause; |
5262 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 5263 extern int input_pending; |
25012 | 5264 |
5265 xassert (current_matrix && desired_matrix); | |
314 | 5266 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5267 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
|
5268 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5269 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5270 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5271 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5272 |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
5273 #if !PERIODIC_PREEMPTION_CHECKING |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
5274 if (!force_p && detect_input_pending_ignore_squeezables ()) |
314 | 5275 { |
5276 pause = 1; | |
5277 goto do_pause; | |
5278 } | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5279 #endif |
314 | 5280 |
25012 | 5281 /* If we cannot insert/delete lines, it's no use trying it. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5282 if (!FRAME_LINE_INS_DEL_OK (f)) |
25012 | 5283 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5284 |
493 | 5285 /* See if any of the desired lines are enabled; don't compute for |
25012 | 5286 i/d line if just want cursor motion. */ |
5287 for (i = 0; i < desired_matrix->nrows; i++) | |
5288 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5289 break; |
5290 | |
5291 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5292 if (!inhibit_id_p && i < desired_matrix->nrows) |
5293 force_p |= scrolling (f); | |
314 | 5294 |
5295 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5296 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5297 update_frame_line (f, desired_matrix->nrows - 1); | |
5298 | |
5299 /* Now update the rest of the lines. */ | |
5300 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5301 { |
25012 | 5302 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5303 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5304 if (FRAME_TERMCAP_P (f)) |
314 | 5305 { |
5306 /* Flush out every so many lines. | |
5307 Also flush out if likely to have more than 1k buffered | |
5308 otherwise. I'm told that some telnet connections get | |
5309 really screwed by more than 1k output at once. */ | |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5310 FILE *display_output = FRAME_TTY (f)->output; |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5311 if (display_output) |
314 | 5312 { |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5313 int outq = PENDING_OUTPUT_COUNT (display_output); |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5314 if (outq > 900 |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5315 || (outq > 20 && ((i - 1) % preempt_count == 0))) |
314 | 5316 { |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5317 fflush (display_output); |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5318 if (preempt_count == 1) |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5319 { |
554 | 5320 #ifdef EMACS_OUTQSIZE |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5321 if (EMACS_OUTQSIZE (0, &outq) < 0) |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5322 /* Probably not a tty. Ignore the error and reset |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5323 the outq count. */ |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5324 outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output)); |
314 | 5325 #endif |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5326 outq *= 10; |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5327 if (baud_rate <= outq && baud_rate > 0) |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5328 sleep (outq / baud_rate); |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5329 } |
314 | 5330 } |
5331 } | |
5332 } | |
5333 | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5334 #if PERIODIC_PREEMPTION_CHECKING |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5335 if (!force_p) |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5336 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5337 EMACS_TIME tm, dif; |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5338 EMACS_GET_TIME (tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5339 EMACS_SUB_TIME (dif, preemption_next_check, tm); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5340 if (EMACS_TIME_NEG_P (dif)) |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5341 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5342 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period); |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
5343 if (detect_input_pending_ignore_squeezables ()) |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
5344 break; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5345 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5346 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5347 #else |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5348 if (!force_p && (i - 1) % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
5349 detect_input_pending_ignore_squeezables (); |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5350 #endif |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5351 |
25012 | 5352 update_frame_line (f, i); |
314 | 5353 } |
5354 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5355 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5356 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
314 | 5357 |
5358 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5359 if (!pause) | |
5360 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5361 if ((cursor_in_echo_area |
25012 | 5362 /* If we are showing a message instead of the mini-buffer, |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5363 show the cursor for the message instead of for the |
25012 | 5364 (now hidden) mini-buffer contents. */ |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5365 || (EQ (minibuf_window, selected_window) |
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5366 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5367 && !NILP (echo_area_buffer[0]))) |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5368 /* These cases apply only to the frame that contains |
25012 | 5369 the active mini-buffer window. */ |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5370 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5371 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5372 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5373 int top = WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f))); |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5374 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5375 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5376 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5377 { |
25012 | 5378 /* Negative value of cursor_in_echo_area means put |
5379 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5380 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5381 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5382 } |
708 | 5383 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5384 { |
25012 | 5385 /* Positive value of cursor_in_echo_area means put |
5386 cursor at the end of the prompt. If the mini-buffer | |
5387 is several lines high, find the last line that has | |
5388 any text on it. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5389 row = FRAME_LINES (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5390 do |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5391 { |
25012 | 5392 --row; |
5393 col = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5394 |
25012 | 5395 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
5396 { | |
5397 /* Frame rows are filled up with spaces that | |
5398 must be ignored here. */ | |
5399 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5400 row); | |
5401 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5402 struct glyph *last = start + r->used[TEXT_AREA]; | |
5403 | |
5404 while (last > start | |
5405 && (last - 1)->charpos < 0) | |
5406 --last; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5407 |
25012 | 5408 col = last - start; |
5409 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5410 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5411 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5412 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5413 /* Make sure COL is not out of range. */ |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5414 if (col >= FRAME_CURSOR_X_LIMIT (f)) |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5415 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5416 /* If we have another row, advance cursor into it. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5417 if (row < FRAME_LINES (f) - 1) |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5418 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5419 col = FRAME_LEFT_SCROLL_BAR_COLS (f); |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5420 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5421 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5422 /* Otherwise move it back in range. */ |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5423 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5424 col = FRAME_CURSOR_X_LIMIT (f) - 1; |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5425 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5426 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5427 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5428 cursor_to (f, row, col); |
708 | 5429 } |
314 | 5430 else |
25012 | 5431 { |
5432 /* We have only one cursor on terminal frames. Use it to | |
5433 display the cursor of the selected window. */ | |
5434 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
29687
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5435 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5436 /* The cursor vpos may be temporarily out of bounds |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5437 in the following situation: There is one window, |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5438 with the cursor in the lower half of it. The window |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5439 is split, and a message causes a redisplay before |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5440 a new cursor position has been computed. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5441 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
25012 | 5442 { |
5443 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5444 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5445 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5446 if (INTEGERP (w->left_margin_cols)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5447 x += XFASTINT (w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5448 |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5449 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5450 cursor_to (f, y, x); |
25012 | 5451 } |
5452 } | |
314 | 5453 } |
5454 | |
5455 do_pause: | |
5456 | |
25012 | 5457 clear_desired_matrices (f); |
314 | 5458 return pause; |
5459 } | |
5460 | |
25012 | 5461 |
5462 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5463 |
21514 | 5464 int |
764 | 5465 scrolling (frame) |
25012 | 5466 struct frame *frame; |
314 | 5467 { |
5468 int unchanged_at_top, unchanged_at_bottom; | |
5469 int window_size; | |
5470 int changed_lines; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5471 int *old_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5472 int *new_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5473 int *draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5474 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
314 | 5475 register int i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5476 int free_at_end_vpos = FRAME_LINES (frame); |
25012 | 5477 struct glyph_matrix *current_matrix = frame->current_matrix; |
5478 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5479 | |
5480 if (!current_matrix) | |
5481 abort (); | |
5482 | |
5483 /* Compute hash codes of all the lines. Also calculate number of | |
5484 changed lines, number of unchanged lines at the beginning, and | |
5485 number of unchanged lines at the end. */ | |
314 | 5486 changed_lines = 0; |
5487 unchanged_at_top = 0; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5488 unchanged_at_bottom = FRAME_LINES (frame); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5489 for (i = 0; i < FRAME_LINES (frame); i++) |
314 | 5490 { |
5491 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5492 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5493 return 0; |
25012 | 5494 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5495 if (! MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5496 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5497 /* This line cannot be redrawn, so don't let scrolling mess it. */ |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5498 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5499 #define INFINITY 1000000 /* Taken from scroll.c */ |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5500 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5501 } |
314 | 5502 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5503 { |
25012 | 5504 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5505 draw_cost[i] = line_draw_cost (desired_matrix, i); | |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5506 } |
314 | 5507 |
5508 if (old_hash[i] != new_hash[i]) | |
5509 { | |
5510 changed_lines++; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5511 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
314 | 5512 } |
5513 else if (i == unchanged_at_top) | |
5514 unchanged_at_top++; | |
25012 | 5515 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5516 } |
5517 | |
5518 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5519 if ((!FRAME_SCROLL_REGION_OK (frame) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5520 && changed_lines < baud_rate / 2400) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5521 || unchanged_at_bottom == FRAME_LINES (frame)) |
314 | 5522 return 1; |
5523 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5524 window_size = (FRAME_LINES (frame) - unchanged_at_top |
314 | 5525 - unchanged_at_bottom); |
5526 | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5527 if (FRAME_SCROLL_REGION_OK (frame)) |
314 | 5528 free_at_end_vpos -= unchanged_at_bottom; |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5529 else if (FRAME_MEMORY_BELOW_FRAME (frame)) |
314 | 5530 free_at_end_vpos = -1; |
5531 | |
5532 /* If large window, fast terminal and few lines in common between | |
25012 | 5533 current frame and desired frame, don't bother with i/d calc. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5534 if (!FRAME_SCROLL_REGION_OK (frame) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5535 && window_size >= 18 && baud_rate > 2400 |
314 | 5536 && (window_size >= |
5537 10 * scrolling_max_lines_saved (unchanged_at_top, | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5538 FRAME_LINES (frame) - unchanged_at_bottom, |
314 | 5539 old_hash, new_hash, draw_cost))) |
5540 return 0; | |
5541 | |
25012 | 5542 if (window_size < 2) |
5543 return 0; | |
5544 | |
764 | 5545 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5546 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
|
5547 old_draw_cost + unchanged_at_top - 1, |
314 | 5548 old_hash + unchanged_at_top - 1, |
5549 new_hash + unchanged_at_top - 1, | |
5550 free_at_end_vpos - unchanged_at_top); | |
5551 | |
5552 return 0; | |
5553 } | |
25012 | 5554 |
5555 | |
5556 /* Count the number of blanks at the start of the vector of glyphs R | |
5557 which is LEN glyphs long. */ | |
5558 | |
5559 static int | |
5560 count_blanks (r, len) | |
5561 struct glyph *r; | |
5562 int len; | |
314 | 5563 { |
25012 | 5564 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5565 |
25012 | 5566 for (i = 0; i < len; ++i) |
5567 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5568 break; | |
5569 | |
5570 return i; | |
314 | 5571 } |
25012 | 5572 |
5573 | |
5574 /* Count the number of glyphs in common at the start of the glyph | |
5575 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5576 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5577 |
5578 static int | |
25012 | 5579 count_match (str1, end1, str2, end2) |
5580 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5581 { |
25012 | 5582 struct glyph *p1 = str1; |
5583 struct glyph *p2 = str2; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5584 |
25012 | 5585 while (p1 < end1 |
5586 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5587 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5588 ++p1, ++p2; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5589 |
25012 | 5590 return p1 - str1; |
314 | 5591 } |
5592 | |
25012 | 5593 |
314 | 5594 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5595 |
314 | 5596 extern int *char_ins_del_vector; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5597 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
314 | 5598 |
25012 | 5599 |
5600 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5601 | |
314 | 5602 static void |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5603 update_frame_line (f, vpos) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5604 struct frame *f; |
314 | 5605 int vpos; |
5606 { | |
25012 | 5607 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5608 int tem; |
5609 int osp, nsp, begmatch, endmatch, olen, nlen; | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5610 struct glyph_matrix *current_matrix = f->current_matrix; |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5611 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5612 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5613 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5614 int must_write_whole_line_p; | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5615 int write_spaces_p = FRAME_MUST_WRITE_SPACES (f); |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5616 int colored_spaces_p = (FACE_FROM_ID (f, DEFAULT_FACE_ID)->background |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5617 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5618 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5619 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5620 write_spaces_p = 1; |
25012 | 5621 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5622 /* Current row not enabled means it has unknown contents. We must |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5623 write the whole desired line in that case. */ |
25012 | 5624 must_write_whole_line_p = !current_row->enabled_p; |
5625 if (must_write_whole_line_p) | |
314 | 5626 { |
25012 | 5627 obody = 0; |
314 | 5628 olen = 0; |
5629 } | |
5630 else | |
5631 { | |
25012 | 5632 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5633 olen = current_row->used[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5634 |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5635 /* Ignore trailing spaces, if we can. */ |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5636 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5637 while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1])) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5638 olen--; |
314 | 5639 } |
5640 | |
25012 | 5641 current_row->enabled_p = 1; |
5642 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5643 | |
5644 /* If desired line is empty, just clear the line. */ | |
5645 if (!desired_row->enabled_p) | |
314 | 5646 { |
5647 nlen = 0; | |
5648 goto just_erase; | |
5649 } | |
5650 | |
25012 | 5651 nbody = desired_row->glyphs[TEXT_AREA]; |
5652 nlen = desired_row->used[TEXT_AREA]; | |
5653 nend = nbody + nlen; | |
5654 | |
5655 /* If display line has unknown contents, write the whole line. */ | |
5656 if (must_write_whole_line_p) | |
5657 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5658 /* Ignore spaces at the end, if we can. */ |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5659 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5660 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5661 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5662 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5663 /* Write the contents of the desired line. */ |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5664 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5665 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5666 cursor_to (f, vpos, 0); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5667 write_glyphs (f, nbody, nlen); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5668 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5669 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5670 /* Don't call clear_end_of_line if we already wrote the whole |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5671 line. The cursor will not be at the right margin in that |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5672 case but in the line below. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5673 if (nlen < FRAME_TOTAL_COLS (f)) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5674 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5675 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5676 clear_end_of_line (f, FRAME_TOTAL_COLS (f)); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5677 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5678 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5679 /* Make sure we are in the right row, otherwise cursor movement |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5680 with cmgoto might use `ch' in the wrong row. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5681 cursor_to (f, vpos, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5682 |
25012 | 5683 make_current (desired_matrix, current_matrix, vpos); |
5684 return; | |
5685 } | |
314 | 5686 |
5687 /* Pretend trailing spaces are not there at all, | |
5688 unless for one reason or another we must write all spaces. */ | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5689 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5690 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5691 nlen--; |
314 | 5692 |
5693 /* If there's no i/d char, quickly do the best we can without it. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5694 if (!FRAME_CHAR_INS_DEL_OK (f)) |
314 | 5695 { |
25012 | 5696 int i, j; |
5697 | |
5698 /* Find the first glyph in desired row that doesn't agree with | |
5699 a glyph in the current row, and write the rest from there on. */ | |
314 | 5700 for (i = 0; i < nlen; i++) |
5701 { | |
25012 | 5702 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5703 { |
25012 | 5704 /* Find the end of the run of different glyphs. */ |
5705 j = i + 1; | |
5706 while (j < nlen | |
5707 && (j >= olen | |
5708 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5709 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5710 ++j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5711 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5712 /* Output this run of non-matching chars. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5713 cursor_to (f, vpos, i); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5714 write_glyphs (f, nbody + i, j - i); |
25012 | 5715 i = j - 1; |
314 | 5716 |
5717 /* Now find the next non-match. */ | |
5718 } | |
5719 } | |
5720 | |
5721 /* Clear the rest of the line, or the non-clear part of it. */ | |
5722 if (olen > nlen) | |
5723 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5724 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5725 clear_end_of_line (f, olen); |
314 | 5726 } |
5727 | |
25012 | 5728 /* Make current row = desired row. */ |
5729 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5730 return; |
5731 } | |
5732 | |
25012 | 5733 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5734 characters in a row. */ | |
5735 | |
314 | 5736 if (!olen) |
5737 { | |
25012 | 5738 /* If current line is blank, skip over initial spaces, if |
5739 possible, and write the rest. */ | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5740 if (write_spaces_p) |
25012 | 5741 nsp = 0; |
5742 else | |
5743 nsp = count_blanks (nbody, nlen); | |
5744 | |
314 | 5745 if (nlen > nsp) |
5746 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5747 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5748 write_glyphs (f, nbody + nsp, nlen - nsp); |
314 | 5749 } |
5750 | |
764 | 5751 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5752 make_current (desired_matrix, current_matrix, vpos); |
314 | 5753 return; |
5754 } | |
5755 | |
5756 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5757 osp = count_blanks (obody, olen); |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5758 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
25012 | 5759 |
5760 /* Compute number of matching chars starting with first non-blank. */ | |
5761 begmatch = count_match (obody + osp, obody + olen, | |
5762 nbody + nsp, nbody + nlen); | |
314 | 5763 |
5764 /* Spaces in new match implicit space past the end of old. */ | |
5765 /* A bug causing this to be a no-op was fixed in 18.29. */ | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5766 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5767 { |
5768 np1 = nbody + nsp; | |
25012 | 5769 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5770 ++begmatch; | |
314 | 5771 } |
5772 | |
5773 /* Avoid doing insert/delete char | |
5774 just cause number of leading spaces differs | |
25012 | 5775 when the following text does not match. */ |
314 | 5776 if (begmatch == 0 && osp != nsp) |
5777 osp = nsp = min (osp, nsp); | |
5778 | |
5779 /* Find matching characters at end of line */ | |
5780 op1 = obody + olen; | |
5781 np1 = nbody + nlen; | |
5782 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5783 while (op1 > op2 |
5784 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5785 { |
5786 op1--; | |
5787 np1--; | |
5788 } | |
5789 endmatch = obody + olen - op1; | |
5790 | |
5791 /* tem gets the distance to insert or delete. | |
5792 endmatch is how many characters we save by doing so. | |
5793 Is it worth it? */ | |
5794 | |
5795 tem = (nlen - nsp) - (olen - osp); | |
5796 if (endmatch && tem | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5797 && (!FRAME_CHAR_INS_DEL_OK (f) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5798 || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5799 endmatch = 0; |
5800 | |
5801 /* nsp - osp is the distance to insert or delete. | |
5802 If that is nonzero, begmatch is known to be nonzero also. | |
5803 begmatch + endmatch is how much we save by doing the ins/del. | |
5804 Is it worth it? */ | |
5805 | |
5806 if (nsp != osp | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5807 && (!FRAME_CHAR_INS_DEL_OK (f) |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5808 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5809 { |
5810 begmatch = 0; | |
5811 endmatch = 0; | |
5812 osp = nsp = min (osp, nsp); | |
5813 } | |
5814 | |
5815 /* Now go through the line, inserting, writing and | |
5816 deleting as appropriate. */ | |
5817 | |
5818 if (osp > nsp) | |
5819 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5820 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5821 delete_glyphs (f, osp - nsp); |
314 | 5822 } |
5823 else if (nsp > osp) | |
5824 { | |
5825 /* If going to delete chars later in line | |
5826 and insert earlier in the line, | |
5827 must delete first to avoid losing data in the insert */ | |
5828 if (endmatch && nlen < olen + nsp - osp) | |
5829 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5830 cursor_to (f, vpos, nlen - endmatch + osp - nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5831 delete_glyphs (f, olen + nsp - osp - nlen); |
314 | 5832 olen = nlen - (nsp - osp); |
5833 } | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5834 cursor_to (f, vpos, osp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5835 insert_glyphs (f, 0, nsp - osp); |
314 | 5836 } |
5837 olen += nsp - osp; | |
5838 | |
5839 tem = nsp + begmatch + endmatch; | |
5840 if (nlen != tem || olen != tem) | |
5841 { | |
5842 if (!endmatch || nlen == olen) | |
5843 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5844 /* If new text being written reaches right margin, there is |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5845 no need to do clear-to-eol at the end of this function |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5846 (and it would not be safe, since cursor is not going to |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5847 be "at the margin" after the text is done). */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5848 if (nlen == FRAME_TOTAL_COLS (f)) |
314 | 5849 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5850 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5851 /* Function write_glyphs is prepared to do nothing |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5852 if passed a length <= 0. Check it here to avoid |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5853 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5854 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5855 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5856 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5857 write_glyphs (f, nbody + nsp + begmatch, nlen - tem); |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5858 } |
314 | 5859 } |
5860 else if (nlen > olen) | |
5861 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5862 /* Here, we used to have the following simple code: |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5863 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5864 write_glyphs (nbody + nsp + begmatch, olen - tem); |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5865 insert_glyphs (nbody + nsp + begmatch + olen - tem, nlen - olen); |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5866 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5867 but it doesn't work if nbody[nsp + begmatch + olen - tem] |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5868 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5869 int out = olen - tem; /* Columns to be overwritten originally. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5870 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5871 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5872 cursor_to (f, vpos, nsp + begmatch); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5873 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5874 /* Calculate columns we can actually overwrite. */ |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5875 while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out])) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5876 out--; |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5877 write_glyphs (f, nbody + nsp + begmatch, out); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5878 |
25012 | 5879 /* If we left columns to be overwritten, we must delete them. */ |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5880 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5881 if (del > 0) |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5882 delete_glyphs (f, del); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5883 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5884 /* At last, we insert columns not yet written out. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5885 insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5886 olen = nlen; |
5887 } | |
5888 else if (olen > nlen) | |
5889 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5890 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5891 write_glyphs (f, nbody + nsp + begmatch, nlen - tem); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5892 delete_glyphs (f, olen - nlen); |
314 | 5893 olen = nlen; |
5894 } | |
5895 } | |
5896 | |
5897 just_erase: | |
5898 /* If any unerased characters remain after the new line, erase them. */ | |
5899 if (olen > nlen) | |
5900 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5901 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5902 clear_end_of_line (f, olen); |
314 | 5903 } |
5904 | |
764 | 5905 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5906 make_current (desired_matrix, current_matrix, vpos); |
314 | 5907 } |
25012 | 5908 |
5909 | |
314 | 5910 |
25012 | 5911 /*********************************************************************** |
5912 X/Y Position -> Buffer Position | |
5913 ***********************************************************************/ | |
5914 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5915 /* Determine what's under window-relative pixel position (*X, *Y). |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5916 Return the object (string or buffer) that's there. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5917 Return in *POS the position in that object. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5918 Adjust *X and *Y to character positions. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5919 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5920 Lisp_Object |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5921 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
25012 | 5922 struct window *w; |
5923 int *x, *y; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5924 struct display_pos *pos; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5925 Lisp_Object *object; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5926 int *dx, *dy; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5927 int *width, *height; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5928 { |
25012 | 5929 struct it it; |
5930 struct buffer *old_current_buffer = current_buffer; | |
5931 struct text_pos startp; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5932 Lisp_Object string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5933 struct glyph_row *row; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5934 #ifdef HAVE_WINDOW_SYSTEM |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5935 struct image *img = 0; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5936 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5937 int x0, x1; |
25012 | 5938 |
5939 current_buffer = XBUFFER (w->buffer); | |
5940 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5941 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5942 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5943 start_display (&it, w, startp); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5944 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5945 x0 = *x - WINDOW_LEFT_MARGIN_WIDTH (w); |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5946 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
25012 | 5947 MOVE_TO_X | MOVE_TO_Y); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5948 |
25012 | 5949 current_buffer = old_current_buffer; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5950 |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5951 *dx = x0 + it.first_visible_x - it.current_x; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5952 *dy = *y - it.current_y; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5953 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5954 string = w->buffer; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5955 if (STRINGP (it.string)) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5956 string = it.string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5957 *pos = it.current; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5958 |
53190
053a4dfb6bd4
* dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
Jan Djärv <jan.h.d@swipnet.se>
parents:
53176
diff
changeset
|
5959 #ifdef HAVE_WINDOW_SYSTEM |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5960 if (it.what == IT_IMAGE) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5961 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5962 if ((img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5963 && !NILP (img->spec)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5964 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5965 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5966 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5967 |
65016
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5968 if (it.vpos < w->current_matrix->nrows |
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5969 && (row = MATRIX_ROW (w->current_matrix, it.vpos), |
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5970 row->enabled_p)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5971 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5972 if (it.hpos < row->used[TEXT_AREA]) |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5973 { |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5974 struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5975 #ifdef HAVE_WINDOW_SYSTEM |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5976 if (img) |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5977 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5978 *dy -= row->ascent - glyph->ascent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5979 *dx += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5980 *dy += glyph->slice.y; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5981 /* Image slices positions are still relative to the entire image */ |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5982 *width = img->width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5983 *height = img->height; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5984 } |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5985 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5986 #endif |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5987 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5988 *width = glyph->pixel_width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5989 *height = glyph->ascent + glyph->descent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5990 } |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5991 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5992 else |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5993 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5994 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5995 *height = row->height; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5996 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5997 } |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5998 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5999 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6000 *width = *height = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6001 } |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6002 |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6003 /* Add extra (default width) columns if clicked after EOL. */ |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6004 x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6005 if (x0 > x1) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6006 it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6007 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6008 *x = it.hpos; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6009 *y = it.vpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6010 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6011 return string; |
25012 | 6012 } |
6013 | |
6014 | |
6015 /* Value is the string under window-relative coordinates X/Y in the | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6016 mode line or header line (PART says which) of window W, or nil if none. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6017 *CHARPOS is set to the position in the string returned. */ |
25012 | 6018 |
6019 Lisp_Object | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6020 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
25012 | 6021 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6022 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6023 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6024 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6025 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6026 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6027 int *width, *height; |
25012 | 6028 { |
6029 struct glyph_row *row; | |
6030 struct glyph *glyph, *end; | |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6031 int x0, y0; |
25012 | 6032 Lisp_Object string = Qnil; |
6033 | |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6034 if (part == ON_MODE_LINE) |
25012 | 6035 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
6036 else | |
25546 | 6037 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6038 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6039 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6040 |
25012 | 6041 if (row->mode_line_p && row->enabled_p) |
11919
31cb053405f2
(Fframe_or_buffer_changed_p): Record frame names
Karl Heuer <kwzh@gnu.org>
parents:
11914
diff
changeset
|
6042 { |
25012 | 6043 /* Find the glyph under X. If we find one with a string object, |
6044 it's the one we were looking for. */ | |
6045 glyph = row->glyphs[TEXT_AREA]; | |
6046 end = glyph + row->used[TEXT_AREA]; | |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
6047 for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6048 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6049 *x = glyph - row->glyphs[TEXT_AREA]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6050 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6051 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6052 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6053 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6054 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6055 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6056 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6057 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6058 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6059 struct image *img; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6060 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6061 if (img != NULL) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6062 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6063 y0 -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6064 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6065 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6066 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6067 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6068 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6069 /* Add extra (default width) columns if clicked after EOL. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6070 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6071 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6072 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6073 } |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6074 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6075 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6076 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6077 *x = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6078 x0 = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6079 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6080 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6081 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6082 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6083 *dy = y0; |
25012 | 6084 |
6085 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6086 } |
25012 | 6087 |
6088 | |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6089 /* Value is the string under window-relative coordinates X/Y in either |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6090 marginal area, or nil if none. *CHARPOS is set to the position in |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6091 the string returned. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6092 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6093 Lisp_Object |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6094 marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6095 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6096 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6097 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6098 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6099 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6100 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6101 int *width, *height; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6102 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6103 struct glyph_row *row = w->current_matrix->rows; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6104 struct glyph *glyph, *end; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6105 int x0, y0, i, wy = *y; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6106 int area; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6107 Lisp_Object string = Qnil; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6108 |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6109 if (part == ON_LEFT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6110 area = LEFT_MARGIN_AREA; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6111 else if (part == ON_RIGHT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6112 area = RIGHT_MARGIN_AREA; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6113 else |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6114 abort (); |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6115 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6116 for (i = 0; row->enabled_p && i < w->current_matrix->nrows; ++i, ++row) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6117 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6118 break; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6119 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6120 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6121 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6122 if (row->enabled_p) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6123 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6124 /* Find the glyph under X. If we find one with a string object, |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6125 it's the one we were looking for. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6126 if (area == RIGHT_MARGIN_AREA) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6127 x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
6128 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6129 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6130 + window_box_width (w, LEFT_MARGIN_AREA) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6131 + window_box_width (w, TEXT_AREA)); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6132 else |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6133 x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
6134 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6135 : 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6136 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6137 glyph = row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6138 end = glyph + row->used[area]; |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
6139 for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6140 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6141 *x = glyph - row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6142 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6143 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6144 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6145 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6146 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6147 *height = glyph->ascent + glyph->descent; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6148 #ifdef HAVE_WINDOW_SYSTEM |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6149 if (glyph->type == IMAGE_GLYPH) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6150 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6151 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6152 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6153 if (img != NULL) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6154 *object = img->spec; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6155 y0 -= row->ascent - glyph->ascent; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6156 x0 += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6157 y0 += glyph->slice.y; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6158 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6159 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6160 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6161 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6162 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6163 /* Add extra (default width) columns if clicked after EOL. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6164 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6165 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6166 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6167 } |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6168 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6169 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6170 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6171 x0 = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6172 *x = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6173 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6174 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6175 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6176 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6177 *dy = y0; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6178 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6179 return string; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6180 } |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6181 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6182 |
25012 | 6183 /*********************************************************************** |
6184 Changing Frame Sizes | |
6185 ***********************************************************************/ | |
314 | 6186 |
6187 #ifdef SIGWINCH | |
25012 | 6188 |
493 | 6189 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
6190 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 6191 int signalnum; /* some compilers complain in signal calls. */ |
314 | 6192 { |
6193 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6194 #ifndef USE_CRT_DLL |
314 | 6195 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6196 #endif |
314 | 6197 int old_errno = errno; |
6198 | |
82989
f3845715a5f6
Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
6199 struct tty_display_info *tty; |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6200 |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6201 signal (SIGWINCH, window_change_signal); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6202 SIGNAL_THREAD_CHECK (signalnum); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6203 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6204 /* The frame size change obviously applies to a single |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6205 termcap-controlled terminal, but we can't decide which. |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6206 Therefore, we resize the frames corresponding to each tty. |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6207 */ |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6208 for (tty = tty_list; tty; tty = tty->next) { |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6209 |
53341 | 6210 if (! tty->term_initted) |
6211 continue; | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6212 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6213 get_tty_size (fileno (tty->input), &width, &height); |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6214 |
83412
573105015a96
Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann)
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
6215 if (width > 5 && height > 2) { |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6216 Lisp_Object tail, frame; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6217 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6218 FOR_EACH_FRAME (tail, frame) |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6219 if (FRAME_TERMCAP_P (XFRAME (frame)) && FRAME_TTY (XFRAME (frame)) == tty) |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6220 /* Record the new sizes, but don't reallocate the data |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6221 structures now. Let that be done later outside of the |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6222 signal handler. */ |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6223 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6224 } |
314 | 6225 } |
6226 | |
6227 errno = old_errno; | |
6228 } | |
6229 #endif /* SIGWINCH */ | |
6230 | |
6231 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6232 /* Do any change in frame size that was requested by a signal. SAFE |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6233 non-zero means this function is called from a place where it is |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6234 safe to change frame sizes while a redisplay is in progress. */ |
314 | 6235 |
21514 | 6236 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6237 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6238 int safe; |
314 | 6239 { |
6240 /* If window_change_signal should have run before, run it now. */ | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6241 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6242 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6243 |
314 | 6244 while (delayed_size_change) |
6245 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6246 Lisp_Object tail, frame; |
314 | 6247 |
6248 delayed_size_change = 0; | |
6249 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6250 FOR_EACH_FRAME (tail, frame) |
314 | 6251 { |
25012 | 6252 struct frame *f = XFRAME (frame); |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6253 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6254 if (f->new_text_lines != 0 || f->new_text_cols != 0) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6255 change_frame_size (f, f->new_text_lines, f->new_text_cols, |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6256 0, 0, safe); |
314 | 6257 } |
6258 } | |
6259 } | |
6260 | |
6261 | |
764 | 6262 /* Change the frame height and/or width. Values may be given as zero to |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6263 indicate no change is to take place. |
314 | 6264 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6265 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
|
6266 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
|
6267 redisplay. Since this tries to resize windows, we can't call it |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6268 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6269 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6270 SAFE non-zero means this function is called from a place where it's |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6271 safe to change frame sizes while a redisplay is in progress. */ |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6272 |
21514 | 6273 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6274 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6275 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6276 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6277 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6278 Lisp_Object tail, frame; |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
6279 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6280 if (FRAME_MSDOS_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6281 { |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6282 /* On MS-DOS, all frames use the same screen, so a change in |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6283 size affects all frames. Termcap now supports multiple |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6284 ttys. */ |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6285 FOR_EACH_FRAME (tail, frame) |
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
6286 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6287 change_frame_size_1 (XFRAME (frame), newheight, newwidth, |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6288 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6289 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6290 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6291 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6292 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6293 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6294 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6295 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6296 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6297 int newheight, newwidth, pretend, delay, safe; |
314 | 6298 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6299 int new_frame_total_cols; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6300 int count = SPECPDL_INDEX (); |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
6301 |
314 | 6302 /* If we can't deal with the change now, queue it for later. */ |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6303 if (delay || (redisplaying_p && !safe)) |
314 | 6304 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6305 f->new_text_lines = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6306 f->new_text_cols = newwidth; |
314 | 6307 delayed_size_change = 1; |
6308 return; | |
6309 } | |
6310 | |
764 | 6311 /* This size-change overrides any pending one for this frame. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6312 f->new_text_lines = 0; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6313 f->new_text_cols = 0; |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6314 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6315 /* If an argument is zero, set it to the current value. */ |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6316 if (newheight == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6317 newheight = FRAME_LINES (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6318 if (newwidth == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6319 newwidth = FRAME_COLS (f); |
25012 | 6320 |
6321 /* Compute width of windows in F. | |
6322 This is the width of the frame without vertical scroll bars. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6323 new_frame_total_cols = FRAME_TOTAL_COLS_ARG (f, newwidth); |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
6324 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6325 /* Round up to the smallest acceptable size. */ |
25012 | 6326 check_frame_size (f, &newheight, &newwidth); |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6327 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6328 /* If we're not changing the frame size, quit now. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6329 if (newheight == FRAME_LINES (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6330 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
314 | 6331 return; |
6332 | |
15078 | 6333 BLOCK_INPUT; |
6334 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6335 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6336 /* We only can set screen dimensions to certain values supported |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6337 by our video hardware. Try to find the smallest size greater |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6338 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6339 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6340 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6341 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6342 if (newheight != FRAME_LINES (f)) |
314 | 6343 { |
25012 | 6344 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 6345 { |
25012 | 6346 /* Frame has both root and mini-buffer. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6347 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
25012 | 6348 FRAME_TOP_MARGIN (f)); |
6349 set_window_height (FRAME_ROOT_WINDOW (f), | |
6350 (newheight | |
6351 - 1 | |
6352 - FRAME_TOP_MARGIN (f)), | |
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
6353 2); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6354 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top_line, |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6355 newheight - 1); |
25012 | 6356 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 6357 } |
6358 else | |
764 | 6359 /* Frame has just one top-level window. */ |
25012 | 6360 set_window_height (FRAME_ROOT_WINDOW (f), |
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
6361 newheight - FRAME_TOP_MARGIN (f), 2); |
25012 | 6362 |
6363 if (FRAME_TERMCAP_P (f) && !pretend) | |
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6364 FrameRows (FRAME_TTY (f)) = newheight; |
314 | 6365 } |
6366 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6367 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
314 | 6368 { |
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
6369 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 2); |
25012 | 6370 if (FRAME_HAS_MINIBUF_P (f)) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6371 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6372 |
6373 if (FRAME_TERMCAP_P (f) && !pretend) | |
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6374 FrameCols (FRAME_TTY (f)) = newwidth; |
25012 | 6375 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6376 if (WINDOWP (f->tool_bar_window)) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6377 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
314 | 6378 } |
6379 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6380 FRAME_LINES (f) = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6381 SET_FRAME_COLS (f, newwidth); |
25012 | 6382 |
6383 { | |
6384 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
6385 int text_area_x, text_area_y, text_area_width, text_area_height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6386 |
25012 | 6387 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
6388 &text_area_height); | |
6389 if (w->cursor.x >= text_area_x + text_area_width) | |
6390 w->cursor.hpos = w->cursor.x = 0; | |
6391 if (w->cursor.y >= text_area_y + text_area_height) | |
6392 w->cursor.vpos = w->cursor.y = 0; | |
6393 } | |
6394 | |
6395 adjust_glyphs (f); | |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6396 calculate_costs (f); |
25012 | 6397 SET_FRAME_GARBAGED (f); |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6398 f->resized_p = 1; |
15065 | 6399 |
6400 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6401 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6402 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6403 |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
6404 run_window_configuration_change_hook (f); |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6405 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6406 unbind_to (count, Qnil); |
314 | 6407 } |
25012 | 6408 |
6409 | |
314 | 6410 |
25012 | 6411 /*********************************************************************** |
6412 Terminal Related Lisp Functions | |
6413 ***********************************************************************/ | |
6414 | |
6415 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6416 1, 1, "FOpen termscript file: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6417 doc: /* Start writing all terminal output to FILE as well as the terminal. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6418 FILE = nil means just close any termscript file currently open. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6419 (file) |
25012 | 6420 Lisp_Object file; |
6421 { | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6422 struct tty_display_info *tty; |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6423 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6424 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6425 error ("Current frame is not on a tty device"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6426 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6427 tty = CURTTY (); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6428 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6429 if (tty->termscript != 0) |
83560 | 6430 { |
6431 BLOCK_INPUT; | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6432 fclose (tty->termscript); |
83560 | 6433 UNBLOCK_INPUT; |
6434 } | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6435 tty->termscript = 0; |
25012 | 6436 |
6437 if (! NILP (file)) | |
6438 { | |
6439 file = Fexpand_file_name (file, Qnil); | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6440 tty->termscript = fopen (SDATA (file), "w"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6441 if (tty->termscript == 0) |
25012 | 6442 report_file_error ("Opening termscript", Fcons (file, Qnil)); |
6443 } | |
6444 return Qnil; | |
6445 } | |
6446 | |
6447 | |
314 | 6448 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, |
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6449 Ssend_string_to_terminal, 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6450 doc: /* Send STRING to the terminal without alteration. |
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6451 Control characters in STRING will have terminal-dependent effects. |
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6452 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6453 Optional parameter TERMINAL specifies the tty terminal device to use. |
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6454 It may be a terminal id, a frame, or nil for the terminal used by the |
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6455 currently selected frame. */) |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6456 (string, terminal) |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6457 Lisp_Object string; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6458 Lisp_Object terminal; |
314 | 6459 { |
83512
5d328dadd0f4
Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83510
diff
changeset
|
6460 struct terminal *t = get_tty_terminal (terminal, 1); |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6461 struct tty_display_info *tty; |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6462 |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6463 /* ??? Perhaps we should do something special for multibyte strings here. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6464 CHECK_STRING (string); |
76621
685fa6c9ae44
(Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
76069
diff
changeset
|
6465 BLOCK_INPUT; |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6466 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6467 if (!t) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6468 error ("Unknown terminal device"); |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6469 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6470 tty = t->display_info.tty; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6471 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6472 if (tty->termscript) |
314 | 6473 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6474 fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6475 fflush (tty->termscript); |
314 | 6476 } |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6477 fwrite (SDATA (string), 1, SBYTES (string), tty->output); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6478 fflush (tty->output); |
76621
685fa6c9ae44
(Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
76069
diff
changeset
|
6479 UNBLOCK_INPUT; |
314 | 6480 return Qnil; |
6481 } | |
6482 | |
25012 | 6483 |
314 | 6484 DEFUN ("ding", Fding, Sding, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6485 doc: /* Beep, or flash the screen. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6486 Also, unless an argument is given, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6487 terminate any keyboard macro currently executing. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6488 (arg) |
314 | 6489 Lisp_Object arg; |
6490 { | |
493 | 6491 if (!NILP (arg)) |
314 | 6492 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6493 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6494 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6495 else |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6496 ring_bell (XFRAME (selected_frame)); |
314 | 6497 } |
6498 else | |
6499 bitch_at_user (); | |
6500 | |
6501 return Qnil; | |
6502 } | |
6503 | |
21514 | 6504 void |
314 | 6505 bitch_at_user () |
6506 { | |
6507 if (noninteractive) | |
6508 putchar (07); | |
25012 | 6509 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6510 error ("Keyboard macro terminated by a command ringing the bell"); |
6511 else | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6512 ring_bell (XFRAME (selected_frame)); |
314 | 6513 } |
6514 | |
25012 | 6515 |
6516 | |
6517 /*********************************************************************** | |
6518 Sleeping, Waiting | |
6519 ***********************************************************************/ | |
6520 | |
314 | 6521 DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6522 doc: /* Pause, without updating display, for SECONDS seconds. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6523 SECONDS may be a floating-point value, meaning that you can wait for a |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6524 fraction of a second. Optional second arg MILLISECONDS specifies an |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6525 additional wait period, in milliseconds; this may be useful if your |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6526 Emacs was built without floating point support. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6527 \(Not all operating systems support waiting for a fraction of a second.) */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6528 (seconds, milliseconds) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6529 Lisp_Object seconds, milliseconds; |
314 | 6530 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6531 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6532 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6533 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
|
6534 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
|
6535 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6536 CHECK_NUMBER (milliseconds); |
2648 | 6537 usec = XINT (milliseconds) * 1000; |
6538 | |
6539 { | |
6540 double duration = extract_float (seconds); | |
6541 sec = (int) duration; | |
6542 usec += (duration - sec) * 1000000; | |
6543 } | |
314 | 6544 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6545 #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
|
6546 if (sec == 0 && usec != 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6547 error ("Millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6548 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6549 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6550 /* 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
|
6551 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6552 { |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
6553 /* We can't rely on the rounding being correct if usec is negative. */ |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6554 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6555 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6556 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6557 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
|
6558 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6559 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6560 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
|
6561 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6562 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6563 return Qnil; |
6564 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6565 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0); |
314 | 6566 |
6567 return Qnil; | |
6568 } | |
6569 | |
25012 | 6570 |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6571 /* This is just like wait_reading_process_output, except that |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6572 it does redisplay. |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6573 |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6574 TIMEOUT is number of seconds to wait (float or integer), |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6575 or t to wait forever. |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6576 READING is 1 if reading input. |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6577 If DO_DISPLAY is >0 display process output while waiting. |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6578 If DO_DISPLAY is >1 perform an initial redisplay before waiting. |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6579 */ |
650 | 6580 |
6581 Lisp_Object | |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6582 sit_for (timeout, reading, do_display) |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6583 Lisp_Object timeout; |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6584 int reading, do_display; |
314 | 6585 { |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6586 int sec, usec; |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6587 |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6588 swallow_events (do_display); |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6589 |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6590 if ((detect_input_pending_run_timers (do_display)) |
71138
5cf77229c85d
(sit_for): Perform redisplay even if input is pending
Kim F. Storm <storm@cua.dk>
parents:
70300
diff
changeset
|
6591 || !NILP (Vexecuting_kbd_macro)) |
314 | 6592 return Qnil; |
650 | 6593 |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6594 if (do_display >= 2) |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6595 redisplay_preserve_echo_area (2); |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6596 |
71804
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6597 if (INTEGERP (timeout)) |
71333
a8cbcce39bd0
(sit_for): Undo 2006-06-01 change. Instead, a
Kim F. Storm <storm@cua.dk>
parents:
71323
diff
changeset
|
6598 { |
71810 | 6599 sec = XINT (timeout); |
71804
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6600 usec = 0; |
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6601 } |
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6602 else if (FLOATP (timeout)) |
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6603 { |
71831
347f809d2edb
(sit_for): Tiny simplification.
Kim F. Storm <storm@cua.dk>
parents:
71810
diff
changeset
|
6604 double seconds = XFLOAT_DATA (timeout); |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6605 sec = (int) seconds; |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6606 usec = (int) ((seconds - sec) * 1000000); |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6607 } |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6608 else if (EQ (timeout, Qt)) |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6609 { |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6610 sec = 0; |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6611 usec = 0; |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6612 } |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6613 else |
71804
1a7b37f82a06
(sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents:
71794
diff
changeset
|
6614 wrong_type_argument (Qnumberp, timeout); |
314 | 6615 |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6616 if (sec == 0 && usec == 0 && !EQ (timeout, Qt)) |
673 | 6617 return Qt; |
6618 | |
314 | 6619 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6620 gobble_input (0); |
650 | 6621 #endif |
6622 | |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6623 wait_reading_process_output (sec, usec, reading ? -1 : 1, do_display, |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6624 Qnil, NULL, 0); |
650 | 6625 |
314 | 6626 return detect_input_pending () ? Qnil : Qt; |
6627 } | |
6628 | |
25012 | 6629 |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6630 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0, |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6631 doc: /* Perform redisplay if no input is available. |
71773 | 6632 If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil, |
72788
102f29870373
(Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents:
71946
diff
changeset
|
6633 perform a full redisplay even if input is available. |
102f29870373
(Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents:
71946
diff
changeset
|
6634 Return t if redisplay was performed, nil otherwise. */) |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6635 (force) |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6636 Lisp_Object force; |
650 | 6637 { |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6638 int count; |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6639 |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6640 swallow_events (1); |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6641 if ((detect_input_pending_run_timers (1) |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6642 && NILP (force) && !redisplay_dont_pause) |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6643 || !NILP (Vexecuting_kbd_macro)) |
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6644 return Qnil; |
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6645 |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6646 count = SPECPDL_INDEX (); |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6647 if (!NILP (force) && !redisplay_dont_pause) |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6648 specbind (Qredisplay_dont_pause, Qt); |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6649 redisplay_preserve_echo_area (2); |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6650 unbind_to (count, Qnil); |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6651 return Qt; |
650 | 6652 } |
25012 | 6653 |
6654 | |
314 | 6655 |
25012 | 6656 /*********************************************************************** |
6657 Other Lisp Functions | |
6658 ***********************************************************************/ | |
6659 | |
6660 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6661 session's frames, frame names, buffers, buffer-read-only flags, and | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6662 buffer-modified-flags. */ |
25012 | 6663 |
6664 static Lisp_Object frame_and_buffer_state; | |
6665 | |
6666 | |
6667 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6668 Sframe_or_buffer_changed_p, 0, 1, 0, |
40979 | 6669 doc: /* Return non-nil if the frame and buffer state appears to have changed. |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6670 VARIABLE is a variable name whose value is either nil or a state vector |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6671 that will be updated to contain all frames and buffers, |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6672 aside from buffers whose names start with space, |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6673 along with the buffers' read-only and modified flags. This allows a fast |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6674 check to see whether buffer menus might need to be recomputed. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6675 If this function returns non-nil, it updates the internal vector to reflect |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6676 the current state. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6677 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6678 If VARIABLE is nil, an internal variable is used. Users should not |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6679 pass nil for VARIABLE. */) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6680 (variable) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6681 Lisp_Object variable; |
25012 | 6682 { |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6683 Lisp_Object state, tail, frame, buf; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6684 Lisp_Object *vecp, *end; |
25012 | 6685 int n; |
6686 | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6687 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6688 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6689 CHECK_SYMBOL (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6690 state = Fsymbol_value (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6691 if (! VECTORP (state)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6692 goto changed; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6693 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6694 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6695 state = frame_and_buffer_state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6696 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6697 vecp = XVECTOR (state)->contents; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6698 end = vecp + XVECTOR (state)->size; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6699 |
25012 | 6700 FOR_EACH_FRAME (tail, frame) |
6701 { | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6702 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6703 goto changed; |
25012 | 6704 if (!EQ (*vecp++, frame)) |
6705 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6706 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6707 goto changed; |
25012 | 6708 if (!EQ (*vecp++, XFRAME (frame)->name)) |
6709 goto changed; | |
6710 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6711 /* Check that the buffer info matches. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6712 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6713 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6714 buf = XCDR (XCAR (tail)); |
25012 | 6715 /* Ignore buffers that aren't included in buffer lists. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6716 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6717 continue; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6718 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6719 goto changed; |
25012 | 6720 if (!EQ (*vecp++, buf)) |
6721 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6722 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6723 goto changed; |
25012 | 6724 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
6725 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6726 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6727 goto changed; |
25012 | 6728 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
6729 goto changed; | |
6730 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6731 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6732 goto changed; |
25012 | 6733 /* Detect deletion of a buffer at the end of the list. */ |
6734 if (EQ (*vecp, Qlambda)) | |
6735 return Qnil; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6736 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6737 /* Come here if we decide the data has changed. */ |
25012 | 6738 changed: |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6739 /* Count the size we will need. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6740 Start with 1 so there is room for at least one lambda at the end. */ |
25012 | 6741 n = 1; |
6742 FOR_EACH_FRAME (tail, frame) | |
6743 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6744 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6745 n += 3; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6746 /* Reallocate the vector if data has grown to need it, |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6747 or if it has shrunk a lot. */ |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6748 if (! VECTORP (state) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6749 || n > XVECTOR (state)->size |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6750 || n + 20 < XVECTOR (state)->size / 2) |
25012 | 6751 /* Add 20 extra so we grow it less often. */ |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6752 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6753 state = Fmake_vector (make_number (n + 20), Qlambda); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6754 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6755 Fset (variable, state); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6756 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6757 frame_and_buffer_state = state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6758 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6759 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6760 /* Record the new data in the (possibly reallocated) vector. */ |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6761 vecp = XVECTOR (state)->contents; |
25012 | 6762 FOR_EACH_FRAME (tail, frame) |
6763 { | |
6764 *vecp++ = frame; | |
6765 *vecp++ = XFRAME (frame)->name; | |
6766 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6767 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6768 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6769 buf = XCDR (XCAR (tail)); |
25012 | 6770 /* Ignore buffers that aren't included in buffer lists. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6771 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6772 continue; |
6773 *vecp++ = buf; | |
6774 *vecp++ = XBUFFER (buf)->read_only; | |
6775 *vecp++ = Fbuffer_modified_p (buf); | |
6776 } | |
6777 /* Fill up the vector with lambdas (always at least one). */ | |
6778 *vecp++ = Qlambda; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6779 while (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6780 < XVECTOR (state)->size) |
25012 | 6781 *vecp++ = Qlambda; |
6782 /* Make sure we didn't overflow the vector. */ | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6783 if (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6784 > XVECTOR (state)->size) |
25012 | 6785 abort (); |
6786 return Qt; | |
6787 } | |
6788 | |
6789 | |
6790 | |
6791 /*********************************************************************** | |
6792 Initialization | |
6793 ***********************************************************************/ | |
6794 | |
6795 /* Initialization done when Emacs fork is started, before doing stty. | |
6796 Determine terminal type and set terminal_driver. Then invoke its | |
6797 decoding routine to set up variables in the terminal package. */ | |
314 | 6798 |
21514 | 6799 void |
314 | 6800 init_display () |
6801 { | |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6802 char *terminal_type; |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6803 |
314 | 6804 #ifdef HAVE_X_WINDOWS |
6805 extern int display_arg; | |
6806 #endif | |
6807 | |
25012 | 6808 /* Construct the space glyph. */ |
6809 space_glyph.type = CHAR_GLYPH; | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6810 SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0); |
25012 | 6811 space_glyph.charpos = -1; |
6812 | |
314 | 6813 inverse_video = 0; |
6814 cursor_in_echo_area = 0; | |
6815 terminal_type = (char *) 0; | |
6816 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6817 /* 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
|
6818 during startup. */ |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6819 Vinitial_window_system = Qnil; |
314 | 6820 |
83146
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6821 /* SIGWINCH needs to be handled no matter what display we start |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6822 with. Otherwise newly opened tty frames will not resize |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6823 automatically. */ |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6824 #ifdef SIGWINCH |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6825 #ifndef CANNOT_DUMP |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6826 if (initialized) |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6827 #endif /* CANNOT_DUMP */ |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6828 signal (SIGWINCH, window_change_signal); |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6829 #endif /* SIGWINCH */ |
314 | 6830 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6831 /* 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
|
6832 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
|
6833 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
|
6834 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6835 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6836 If the DISPLAY environment variable is set and nonempty, |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6837 try to use X, and die with an error message if that doesn't work. */ |
314 | 6838 |
6839 #ifdef HAVE_X_WINDOWS | |
69952
b9da898695a5
* dispnew.c (init_display): Don't init X display if the user asked
Jan Djärv <jan.h.d@swipnet.se>
parents:
69607
diff
changeset
|
6840 if (! inhibit_window_system && ! display_arg) |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6841 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6842 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6843 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6844 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6845 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6846 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6847 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6848 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6849 display_arg = (display != 0 && *display != 0); |
69607
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6850 |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6851 if (display_arg && !x_display_ok (display)) |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6852 { |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6853 fprintf (stderr, "Display %s unavailable, simulating -nw\n", |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6854 display); |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6855 inhibit_window_system = 1; |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6856 } |
2364 | 6857 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6858 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6859 if (!inhibit_window_system && display_arg |
18774
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6860 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6861 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6862 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6863 ) |
314 | 6864 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6865 Vinitial_window_system = intern ("x"); |
314 | 6866 #ifdef HAVE_X11 |
6867 Vwindow_system_version = make_number (11); | |
6868 #endif | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6869 #if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6870 /* In some versions of ncurses, |
15282 | 6871 tputs crashes if we have not called tgetent. |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6872 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6873 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6874 #endif |
25012 | 6875 adjust_frame_glyphs_initially (); |
314 | 6876 return; |
6877 } | |
6878 #endif /* HAVE_X_WINDOWS */ | |
6879 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6880 #ifdef HAVE_NTGUI |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6881 if (!inhibit_window_system) |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6882 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6883 Vinitial_window_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6884 Vwindow_system_version = make_number (1); |
25012 | 6885 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6886 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6887 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6888 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6889 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6890 #ifdef MAC_OS |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6891 if (!inhibit_window_system) |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6892 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6893 Vinitial_window_system = intern ("mac"); |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6894 Vwindow_system_version = make_number (1); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6895 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6896 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6897 } |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6898 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6899 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6900 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6901 if (!inhibit_window_system |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6902 #ifndef CANNOT_DUMP |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6903 && initialized |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6904 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6905 ) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6906 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6907 Vinitial_window_system = intern("ns"); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6908 Vwindow_system_version = make_number(10); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6909 adjust_frame_glyphs_initially (); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6910 return; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6911 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6912 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6913 |
314 | 6914 /* If no window system has been specified, try to use the terminal. */ |
6915 if (! isatty (0)) | |
6916 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6917 fatal ("standard input is not a tty"); |
314 | 6918 exit (1); |
6919 } | |
6920 | |
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6921 #ifdef WINDOWSNT |
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6922 terminal_type = "w32console"; |
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6923 #else |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
6924 /* Look at the TERM variable. */ |
314 | 6925 terminal_type = (char *) getenv ("TERM"); |
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6926 #endif |
314 | 6927 if (!terminal_type) |
6928 { | |
6929 #ifdef VMS | |
6930 fprintf (stderr, "Please specify your terminal type.\n\ | |
6931 For types defined in VMS, use set term /device=TYPE.\n\ | |
6932 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6933 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
71944
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6934 #else /* not VMS */ |
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6935 |
71946 | 6936 #ifdef HAVE_WINDOW_SYSTEM |
71945 | 6937 if (! inhibit_window_system) |
6938 fprintf (stderr, "Please set the environment variable DISPLAY or TERM (see `tset').\n"); | |
71944
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6939 else |
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6940 #endif /* HAVE_WINDOW_SYSTEM */ |
71945 | 6941 fprintf (stderr, "Please set the environment variable TERM; see `tset'.\n"); |
71944
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6942 #endif /* not VMS */ |
314 | 6943 exit (1); |
6944 } | |
6945 | |
6946 #ifdef VMS | |
25012 | 6947 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6948 Hardly any uppercase letters in terminal types; should be none. */ |
6949 { | |
6950 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6951 char *p; | |
6952 | |
6953 strcpy (new, terminal_type); | |
6954 | |
6955 for (p = new; *p; p++) | |
6956 if (isupper (*p)) | |
6957 *p = tolower (*p); | |
6958 | |
6959 terminal_type = new; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6960 } |
25012 | 6961 #endif /* VMS */ |
314 | 6962 |
53341 | 6963 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6964 struct terminal *t; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6965 struct frame *f = XFRAME (selected_frame); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6966 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6967 /* Open a display on the controlling tty. */ |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6968 t = init_tty (0, terminal_type, 1); /* Errors are fatal. */ |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6969 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6970 /* Convert the initial frame to use the new display. */ |
83090
72c2a3eb27da
Trivial cosmetic change in dispnew.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
6971 if (f->output_method != output_initial) |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6972 abort (); |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6973 f->output_method = t->type; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6974 f->terminal = t; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6975 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6976 t->reference_count++; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6977 t->display_info.tty->top_frame = selected_frame; |
83362
c3dd82172ed1
Enforce the presence of `window-system' and `tty-type' frame parameters in all frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
6978 change_frame_size (XFRAME (selected_frame), |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6979 FrameRows (t->display_info.tty), |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6980 FrameCols (t->display_info.tty), 0, 0, 1); |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6981 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6982 /* Delete the initial terminal. */ |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6983 if (--initial_terminal->reference_count == 0 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6984 && initial_terminal->delete_terminal_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6985 (*initial_terminal->delete_terminal_hook) (initial_terminal); |
83074
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6986 |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6987 /* Update frame parameters to reflect the new type. */ |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6988 Fmodify_frame_parameters |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6989 (selected_frame, Fcons (Fcons (Qtty_type, |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6990 Ftty_type (selected_frame)), Qnil)); |
83362
c3dd82172ed1
Enforce the presence of `window-system' and `tty-type' frame parameters in all frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
6991 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); |
53341 | 6992 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6993 |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6994 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6995 struct frame *sf = SELECTED_FRAME (); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6996 int width = FRAME_TOTAL_COLS (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6997 int height = FRAME_LINES (sf); |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6998 |
25012 | 6999 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
7000 | |
7001 /* If these sizes are so big they cause overflow, just ignore the | |
7002 change. It's not clear what better we could do. */ | |
7003 if (total_glyphs / sizeof (struct glyph) / height != width + 2) | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
7004 fatal ("screen size %dx%d too big", width, height); |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
7005 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
7006 |
25012 | 7007 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7008 calculate_costs (XFRAME (selected_frame)); |
314 | 7009 |
25012 | 7010 /* Set up faces of the initial terminal frame of a dumped Emacs. */ |
7011 if (initialized | |
7012 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7013 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7014 /* The MSDOS terminal turns on its ``window system'' relatively |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7015 late into the startup, so we cannot do the frame faces' |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7016 initialization just yet. It will be done later by pc-win.el |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7017 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7018 && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system) |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7019 #endif |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7020 && NILP (Vinitial_window_system)) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7021 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7022 /* For the initial frame, we don't have any way of knowing what |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7023 are the foreground and background colors of the terminal. */ |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7024 struct frame *sf = SELECTED_FRAME(); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7025 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
7026 FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR; |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
7027 FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7028 call0 (intern ("tty-set-up-initial-frame-faces")); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7029 } |
314 | 7030 } |
25012 | 7031 |
7032 | |
314 | 7033 |
25012 | 7034 /*********************************************************************** |
7035 Blinking cursor | |
7036 ***********************************************************************/ | |
7037 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
7038 DEFUN ("internal-show-cursor", Finternal_show_cursor, |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7039 Sinternal_show_cursor, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7040 doc: /* Set the cursor-visibility flag of WINDOW to SHOW. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7041 WINDOW nil means use the selected window. SHOW non-nil means |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7042 show a cursor in WINDOW in the next redisplay. SHOW nil means |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7043 don't show a cursor. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7044 (window, show) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7045 Lisp_Object window, show; |
25012 | 7046 { |
7047 /* Don't change cursor state while redisplaying. This could confuse | |
7048 output routines. */ | |
7049 if (!redisplaying_p) | |
7050 { | |
7051 if (NILP (window)) | |
7052 window = selected_window; | |
7053 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
7054 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7055 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7056 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 7057 } |
7058 | |
7059 return Qnil; | |
7060 } | |
7061 | |
7062 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7063 DEFUN ("internal-show-cursor-p", Finternal_show_cursor_p, |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7064 Sinternal_show_cursor_p, 0, 1, 0, |
40979 | 7065 doc: /* Value is non-nil if next redisplay will display a cursor in WINDOW. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7066 WINDOW nil or omitted means report on the selected window. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7067 (window) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7068 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7069 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7070 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7071 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7072 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7073 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7074 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
7075 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7076 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7077 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7078 return w->cursor_off_p ? Qnil : Qt; |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7079 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7080 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7081 DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame, |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7082 Slast_nonminibuf_frame, 0, 0, 0, |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7083 doc: /* Value is last nonminibuffer frame. */) |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7084 () |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7085 { |
95639
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7086 Lisp_Object frame = Qnil; |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7087 |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7088 if (last_nonminibuf_frame) |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7089 XSETFRAME (frame, last_nonminibuf_frame); |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7090 |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7091 return frame; |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7092 } |
25012 | 7093 |
7094 /*********************************************************************** | |
7095 Initialization | |
7096 ***********************************************************************/ | |
7097 | |
21514 | 7098 void |
314 | 7099 syms_of_display () |
7100 { | |
764 | 7101 defsubr (&Sredraw_frame); |
314 | 7102 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
7103 defsubr (&Sframe_or_buffer_changed_p); |
314 | 7104 defsubr (&Sopen_termscript); |
7105 defsubr (&Sding); | |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
7106 defsubr (&Sredisplay); |
314 | 7107 defsubr (&Ssleep_for); |
7108 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
7109 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7110 defsubr (&Sinternal_show_cursor_p); |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7111 defsubr (&Slast_nonminibuf_frame); |
314 | 7112 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
7113 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7114 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7115 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7116 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
7117 frame_and_buffer_state = Fmake_vector (make_number (20), Qlambda); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
7118 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
7119 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7120 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7121 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
7122 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
7123 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7124 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7125 DEFVAR_INT ("baud-rate", &baud_rate, |
40979 | 7126 doc: /* *The output baud rate of the terminal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7127 On most systems, changing this value will affect the amount of padding |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7128 and the other strategic decisions made during redisplay. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7129 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7130 DEFVAR_BOOL ("inverse-video", &inverse_video, |
40979 | 7131 doc: /* *Non-nil means invert the entire frame display. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7132 This means everything is in inverse video which otherwise would not be. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7133 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7134 DEFVAR_BOOL ("visible-bell", &visible_bell, |
40979 | 7135 doc: /* *Non-nil means try to flash the frame to represent a bell. |
40334
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
7136 |
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
7137 See also `ring-bell-function'. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7138 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7139 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
40979 | 7140 doc: /* *Non-nil means no need to redraw entire frame after suspending. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7141 A non-nil value is useful if the terminal can automatically preserve |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7142 Emacs's frame display when you reenter Emacs. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7143 It is up to you to set this variable if your terminal can do that. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7144 |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7145 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system, |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7146 doc: /* Name of the window system that Emacs uses for the first frame. |
41025
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
7147 The value is a symbol--for instance, `x' for X windows. |
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
7148 The value is nil if Emacs is using a text-only terminal. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7149 |
85614
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7150 DEFVAR_KBOARD ("window-system", Vwindow_system, |
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7151 doc: /* Name of window system through which the selected frame is displayed. |
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7152 The value is a symbol--for instance, `x' for X windows. |
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7153 The value is nil if the selected frame is on a text-only-terminal. */); |
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7154 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7155 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
40979 | 7156 doc: /* The version number of the window system in use. |
85826 | 7157 For X windows, this is 11. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7158 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7159 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
40979 | 7160 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7161 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7162 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
40979 | 7163 doc: /* Table defining how to output a glyph code to the frame. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7164 If not nil, this is a vector indexed by glyph code to define the glyph. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7165 Each element can be: |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7166 integer: a glyph code which this glyph is an alias for. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7167 string: output this glyph using that string (not impl. in X windows). |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7168 nil: this glyph mod 524288 is the code of a character to output, |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7169 and this glyph / 524288 is the face number (see `face-id') to use |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7170 while outputting it. */); |
314 | 7171 Vglyph_table = Qnil; |
7172 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7173 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
40979 | 7174 doc: /* Display table to use for buffers that specify none. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7175 See `buffer-display-table' for more information. */); |
314 | 7176 Vstandard_display_table = Qnil; |
7177 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7178 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
40979 | 7179 doc: /* *Non-nil means update isn't paused when input is detected. */); |
25012 | 7180 redisplay_dont_pause = 0; |
7181 | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7182 #if PERIODIC_PREEMPTION_CHECKING |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7183 DEFVAR_LISP ("redisplay-preemption-period", &Vredisplay_preemption_period, |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7184 doc: /* *The period in seconds between checking for input during redisplay. |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7185 If input is detected, redisplay is pre-empted, and the input is processed. |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7186 If nil, never pre-empt redisplay. */); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7187 Vredisplay_preemption_period = make_float (0.10); |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7188 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7189 |
314 | 7190 #ifdef CANNOT_DUMP |
7191 if (noninteractive) | |
7192 #endif | |
7193 { | |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7194 Vinitial_window_system = Qnil; |
314 | 7195 Vwindow_system_version = Qnil; |
7196 } | |
7197 } | |
52401 | 7198 |
7199 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
7200 (do not change this comment) */ |