Mercurial > emacs
annotate src/dispnew.c @ 83530:46b1096093f5
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-294
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-295
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-296
Update from CVS: admin/FOR-RELEASE: Update refcard section.
* emacs@sv.gnu.org/emacs--devo--0--patch-297
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-298
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-299
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-300
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-301
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-302
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-303
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-304
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-103
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-104
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 12 Jun 2006 07:27:12 +0000 |
parents | d9f8d2a65d18 623f01d9e470 |
children | a387c138b28e |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
65905
diff
changeset
|
4 2004, 2005, 2006 Free Software Foundation, Inc. |
314 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
10 the Free Software Foundation; either version 2, or (at your option) |
314 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
314 | 22 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
23 #include <config.h> |
314 | 24 #include <signal.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
25 #include <stdio.h> |
314 | 26 #include <ctype.h> |
27 | |
21514 | 28 #ifdef HAVE_UNISTD_H |
29 #include <unistd.h> | |
30 #endif | |
31 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
32 #include "lisp.h" |
314 | 33 #include "termchar.h" |
34 #include "termopts.h" | |
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
35 /* cm.h must come after dispextern.h on Windows. */ |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
36 #include "dispextern.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
37 #include "cm.h" |
314 | 38 #include "buffer.h" |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
39 #include "charset.h" |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
40 #include "keyboard.h" |
764 | 41 #include "frame.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
42 #include "termhooks.h" |
314 | 43 #include "window.h" |
44 #include "commands.h" | |
45 #include "disptab.h" | |
46 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
47 #include "intervals.h" |
15065 | 48 #include "blockinput.h" |
21514 | 49 #include "process.h" |
314 | 50 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
52 include the following file. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
53 /* #include "systty.h" */ |
12917 | 54 #include "syssignal.h" |
554 | 55 |
314 | 56 #ifdef HAVE_X_WINDOWS |
57 #include "xterm.h" | |
25012 | 58 #endif /* HAVE_X_WINDOWS */ |
314 | 59 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
62 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
63 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
64 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
65 #include "macterm.h" |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
66 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
67 |
25012 | 68 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
69 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
70 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
71 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
72 |
25012 | 73 /* To get the prototype for `sleep'. */ |
74 | |
75 #ifdef HAVE_UNISTD_H | |
76 #include <unistd.h> | |
77 #endif | |
78 | |
314 | 79 /* Get number of chars of output now in the buffer of a stdio stream. |
25012 | 80 This ought to be built in in stdio, but it isn't. Some s- files |
81 override this because their stdio internals differ. */ | |
82 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
83 #ifdef __GNU_LIBRARY__ |
25012 | 84 |
85 /* The s- file might have overridden the definition with one that | |
86 works for the system's C library. But we are using the GNU C | |
87 library, so this is the right definition for every system. */ | |
88 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
89 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
90 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
91 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
92 #undef PENDING_OUTPUT_COUNT |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
93 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
94 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
95 #else /* not __GNU_LIBRARY__ */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
96 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
97 #include <stdio_ext.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
98 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE) |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
99 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
100 #ifndef PENDING_OUTPUT_COUNT |
314 | 101 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
102 #endif | |
25012 | 103 #endif /* not __GNU_LIBRARY__ */ |
104 | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
105 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 106 #include <term.h> /* for tgetent */ |
107 #endif | |
25012 | 108 |
109 /* Structure to pass dimensions around. Used for character bounding | |
110 boxes, glyph matrix dimensions and alike. */ | |
111 | |
112 struct dim | |
113 { | |
114 int width; | |
115 int height; | |
116 }; | |
117 | |
118 | |
119 /* Function prototypes. */ | |
120 | |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
121 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
122 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
123 static void fake_current_matrices P_ ((Lisp_Object)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
124 static void redraw_overlapping_rows P_ ((struct window *, int)); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
125 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 126 static int count_blanks P_ ((struct glyph *, int)); |
127 static int count_match P_ ((struct glyph *, struct glyph *, | |
128 struct glyph *, struct glyph *)); | |
129 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
130 static void update_frame_line P_ ((struct frame *, int)); | |
131 static struct dim allocate_matrices_for_frame_redisplay | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
132 P_ ((Lisp_Object, int, int, int, int *)); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
133 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
25012 | 134 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
135 static void adjust_frame_glyphs P_ ((struct frame *)); | |
136 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
137 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
138 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
139 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
140 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 141 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
142 #if GLYPH_DEBUG |
25012 | 143 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
144 #endif |
25012 | 145 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
146 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
147 struct window *)); | |
148 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
149 struct window *)); | |
150 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
151 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
152 static void adjust_frame_glyphs_initially P_ ((void)); | |
153 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
154 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
155 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
156 static void build_frame_matrix P_ ((struct frame *)); | |
157 void clear_current_matrices P_ ((struct frame *)); | |
158 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
159 int, int)); | |
160 static void clear_window_matrices P_ ((struct window *, int)); | |
161 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
162 static int scrolling_window P_ ((struct window *, int)); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
163 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 164 static void update_marginal_area P_ ((struct window *, int, int)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
165 static int update_text_area P_ ((struct window *, int)); |
25012 | 166 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
167 int)); | |
168 static void mirror_make_current P_ ((struct window *, int)); | |
169 void check_window_matrix_pointers P_ ((struct window *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
170 #if GLYPH_DEBUG |
25012 | 171 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
172 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
173 #endif |
25012 | 174 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
175 static int update_window_tree P_ ((struct window *, int)); | |
176 static int update_window P_ ((struct window *, int)); | |
177 static int update_frame_1 P_ ((struct frame *, int, int)); | |
178 static void set_window_cursor_after_update P_ ((struct window *)); | |
179 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
180 struct glyph_row *, int)); |
25012 | 181 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
182 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
183 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
184 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
185 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
186 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 187 |
188 | |
189 /* Non-zero means don't pause redisplay for pending input. (This is | |
190 for debugging and for a future implementation of EDT-like | |
191 scrolling. */ | |
192 | |
193 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
194 |
554 | 195 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 196 current contents of actual terminal frame; clear and redraw it. */ |
314 | 197 |
764 | 198 int frame_garbaged; |
314 | 199 |
25012 | 200 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 201 |
202 int display_completed; | |
203 | |
25012 | 204 /* Lisp variable visible-bell; enables use of screen-flash instead of |
205 audible bell. */ | |
314 | 206 |
207 int visible_bell; | |
208 | |
764 | 209 /* Invert the color of the whole frame, at a low level. */ |
314 | 210 |
211 int inverse_video; | |
212 | |
213 /* Line speed of the terminal. */ | |
214 | |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42835
diff
changeset
|
215 EMACS_INT baud_rate; |
314 | 216 |
25012 | 217 /* Either nil or a symbol naming the window system under which Emacs |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
218 creates the first frame. */ |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
219 |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
220 Lisp_Object Vinitial_window_system; |
314 | 221 |
222 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 223 |
314 | 224 Lisp_Object Vwindow_system_version; |
225 | |
25012 | 226 /* Vector of glyph definitions. Indexed by glyph number, the contents |
227 are a string which is how to output the glyph. | |
314 | 228 |
229 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 230 as a character code. |
231 | |
232 This is an obsolete feature that is no longer used. The variable | |
233 is retained for compatibility. */ | |
314 | 234 |
235 Lisp_Object Vglyph_table; | |
236 | |
237 /* Display table to use for vectors that don't specify their own. */ | |
238 | |
239 Lisp_Object Vstandard_display_table; | |
240 | |
25012 | 241 /* Nonzero means reading single-character input with prompt so put |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
242 cursor on mini-buffer after the prompt. Positive means at end of |
25012 | 243 text in echo area; negative means at beginning of line. */ |
244 | |
314 | 245 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
246 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
247 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 248 |
314 | 249 |
25012 | 250 /* The currently selected frame. In a single-frame version, this |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
251 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
252 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
253 Lisp_Object selected_frame; |
25012 | 254 |
255 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 256 frames. This is usually the most recent such frame that was |
9572 | 257 selected. In a single-frame version, this variable always holds |
258 the address of the_only_frame. */ | |
25012 | 259 |
260 struct frame *last_nonminibuf_frame; | |
261 | |
262 /* 1 means SIGWINCH happened when not safe. */ | |
263 | |
264 int delayed_size_change; | |
265 | |
266 /* 1 means glyph initialization has been completed at startup. */ | |
267 | |
268 static int glyphs_initialized_initially_p; | |
269 | |
270 /* Updated window if != 0. Set by update_window. */ | |
271 | |
272 struct window *updated_window; | |
273 | |
274 /* Glyph row updated in update_window_line, and area that is updated. */ | |
275 | |
276 struct glyph_row *updated_row; | |
277 int updated_area; | |
278 | |
279 /* A glyph for a space. */ | |
280 | |
281 struct glyph space_glyph; | |
282 | |
283 /* Non-zero means update has been performed directly, so that there's | |
284 no need for redisplay_internal to do much work. Set by | |
285 direct_output_for_insert. */ | |
286 | |
287 int redisplay_performed_directly_p; | |
288 | |
289 /* Counts of allocated structures. These counts serve to diagnose | |
290 memory leaks and double frees. */ | |
291 | |
292 int glyph_matrix_count; | |
293 int glyph_pool_count; | |
294 | |
295 /* If non-null, the frame whose frame matrices are manipulated. If | |
296 null, window matrices are worked on. */ | |
297 | |
298 static struct frame *frame_matrix_frame; | |
299 | |
300 /* Non-zero means that fonts have been loaded since the last glyph | |
301 matrix adjustments. Redisplay must stop, and glyph matrices must | |
302 be adjusted when this flag becomes non-zero during display. The | |
303 reason fonts can be loaded so late is that fonts of fontsets are | |
304 loaded on demand. */ | |
305 | |
306 int fonts_changed_p; | |
307 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
308 /* Convert vpos and hpos from frame to window and vice versa. |
25012 | 309 This may only be used for terminal frames. */ |
310 | |
311 #if GLYPH_DEBUG | |
312 | |
313 static int window_to_frame_vpos P_ ((struct window *, int)); | |
314 static int window_to_frame_hpos P_ ((struct window *, int)); | |
315 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
316 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
317 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
318 /* 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
|
319 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
320 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
321 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
322 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
323 char trace[512 + 100]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
324 }; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
325 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
326 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
327 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
328 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
329 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
330 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
331 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
332 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
|
333 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
338 /* 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
|
339 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
340 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 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
|
344 static void add_window_display_history P_ ((struct window *, char *, int)); |
71141 | 345 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 /* Add to the redisplay history how window W has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 MSG is a trace containing the information how W's glyph matrix |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
348 has been constructed. PAUSED_P non-zero means that the update |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
358 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
363 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 && STRINGP (XBUFFER (w->buffer)->name)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
369 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
372 strcat (buf, msg); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 /* Add to the redisplay history that frame F has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 PAUSED_P non-zero means that the update has been interrupted for |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
386 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
391 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 f, paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 Sdump_redisplay_history, 0, 0, "", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
400 doc: /* Dump redisplay history to stderr. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
401 () |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 for (i = history_idx - 1; i != history_idx; --i) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 return Qnil; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
413 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
414 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 |
25012 | 416 #else /* GLYPH_DEBUG == 0 */ |
417 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
418 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + WINDOW_TOP_EDGE_LINE (W)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
419 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
25012 | 420 |
421 #endif /* GLYPH_DEBUG == 0 */ | |
422 | |
423 | |
424 /* Like bcopy except never gets confused by overlap. Let this be the | |
425 first function defined in this file, or change emacs.c where the | |
426 address of this function is used. */ | |
314 | 427 |
428 void | |
429 safe_bcopy (from, to, size) | |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
430 const char *from; |
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
431 char *to; |
314 | 432 int size; |
433 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
434 if (size <= 0 || from == to) |
314 | 435 return; |
436 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
437 /* If the source and destination don't overlap, then bcopy can |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
438 handle it. If they do overlap, but the destination is lower in |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
439 memory than the source, we'll assume bcopy can handle that. */ |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
440 if (to < from || from + size <= to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
441 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
442 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
443 /* Otherwise, we'll copy from the end. */ |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
444 else |
314 | 445 { |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
446 register const char *endf = from + size; |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
447 register char *endt = to + size; |
314 | 448 |
449 /* If TO - FROM is large, then we should break the copy into | |
450 nonoverlapping chunks of TO - FROM bytes each. However, if | |
451 TO - FROM is small, then the bcopy function call overhead | |
452 makes this not worth it. The crossover point could be about | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
453 anywhere. Since I don't think the obvious copy loop is too |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
454 bad, I'm trying to err in its favor. */ |
314 | 455 if (to - from < 64) |
456 { | |
457 do | |
458 *--endt = *--endf; | |
459 while (endf != from); | |
460 } | |
461 else | |
462 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
463 for (;;) |
314 | 464 { |
465 endt -= (to - from); | |
466 endf -= (to - from); | |
467 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
468 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
469 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
470 |
314 | 471 bcopy (endf, endt, to - from); |
472 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
473 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
474 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 475 little left over. The amount left over is (endt + (to - |
476 from)) - to, which is endt - from. */ | |
314 | 477 bcopy (from, to, endt - from); |
478 } | |
479 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
480 } |
314 | 481 |
25012 | 482 |
483 | |
484 /*********************************************************************** | |
485 Glyph Matrices | |
486 ***********************************************************************/ | |
487 | |
488 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
489 pool from which memory for the matrix should be allocated, or null | |
490 for window-based redisplay where no glyph pools are used. The | |
491 member `pool' of the glyph matrix structure returned is set to | |
492 POOL, the structure is otherwise zeroed. */ | |
493 | |
494 struct glyph_matrix * | |
495 new_glyph_matrix (pool) | |
496 struct glyph_pool *pool; | |
497 { | |
498 struct glyph_matrix *result; | |
499 | |
500 /* Allocate and clear. */ | |
501 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
502 bzero (result, sizeof *result); | |
503 | |
504 /* Increment number of allocated matrices. This count is used | |
505 to detect memory leaks. */ | |
506 ++glyph_matrix_count; | |
507 | |
508 /* Set pool and return. */ | |
509 result->pool = pool; | |
510 return result; | |
511 } | |
512 | |
513 | |
514 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
515 | |
516 The global counter glyph_matrix_count is decremented when a matrix | |
517 is freed. If the count gets negative, more structures were freed | |
518 than allocated, i.e. one matrix was freed more than once or a bogus | |
519 pointer was passed to this function. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
520 |
25012 | 521 If MATRIX->pool is null, this means that the matrix manages its own |
522 glyph memory---this is done for matrices on X frames. Freeing the | |
523 matrix also frees the glyph memory in this case. */ | |
524 | |
525 static void | |
526 free_glyph_matrix (matrix) | |
527 struct glyph_matrix *matrix; | |
528 { | |
529 if (matrix) | |
530 { | |
531 int i; | |
532 | |
533 /* Detect the case that more matrices are freed than were | |
534 allocated. */ | |
535 if (--glyph_matrix_count < 0) | |
536 abort (); | |
537 | |
538 /* Free glyph memory if MATRIX owns it. */ | |
539 if (matrix->pool == NULL) | |
540 for (i = 0; i < matrix->rows_allocated; ++i) | |
541 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
542 |
25012 | 543 /* Free row structures and the matrix itself. */ |
544 xfree (matrix->rows); | |
545 xfree (matrix); | |
546 } | |
547 } | |
548 | |
549 | |
550 /* Return the number of glyphs to reserve for a marginal area of | |
551 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
552 display line of window W. MARGIN gives the width of the marginal | |
553 area in canonical character units. MARGIN should be an integer | |
554 or a float. */ | |
555 | |
556 static int | |
557 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
558 struct window *w; | |
559 int total_glyphs; | |
560 Lisp_Object margin; | |
561 { | |
562 int n; | |
563 | |
564 if (NUMBERP (margin)) | |
565 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
566 int width = XFASTINT (w->total_cols); |
25012 | 567 double d = max (0, XFLOATINT (margin)); |
568 d = min (width / 2 - 1, d); | |
57808
a1c4ff636947
(margin_glyphs_to_reserve): Don't use ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
56727
diff
changeset
|
569 n = (int) ((double) total_glyphs / width * d); |
25012 | 570 } |
571 else | |
572 n = 0; | |
573 | |
574 return n; | |
575 } | |
576 | |
577 | |
578 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
579 window sizes. | |
580 | |
581 W is null if the function is called for a frame glyph matrix. | |
582 Otherwise it is the window MATRIX is a member of. X and Y are the | |
583 indices of the first column and row of MATRIX within the frame | |
584 matrix, if such a matrix exists. They are zero for purely | |
585 window-based redisplay. DIM is the needed size of the matrix. | |
586 | |
587 In window-based redisplay, where no frame matrices exist, glyph | |
588 matrices manage their own glyph storage. Otherwise, they allocate | |
589 storage from a common frame glyph pool which can be found in | |
590 MATRIX->pool. | |
591 | |
592 The reason for this memory management strategy is to avoid complete | |
593 frame redraws if possible. When we allocate from a common pool, a | |
594 change of the location or size of a sub-matrix within the pool | |
595 requires a complete redisplay of the frame because we cannot easily | |
596 make sure that the current matrices of all windows still agree with | |
597 what is displayed on the screen. While this is usually fast, it | |
598 leads to screen flickering. */ | |
599 | |
600 static void | |
601 adjust_glyph_matrix (w, matrix, x, y, dim) | |
602 struct window *w; | |
603 struct glyph_matrix *matrix; | |
604 int x, y; | |
605 struct dim dim; | |
606 { | |
607 int i; | |
608 int new_rows; | |
609 int marginal_areas_changed_p = 0; | |
25546 | 610 int header_line_changed_p = 0; |
611 int header_line_p = 0; | |
25012 | 612 int left = -1, right = -1; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
613 int window_width = -1, window_height; |
25012 | 614 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
615 /* See if W had a header line that has disappeared now, or vice versa. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
616 Get W's size. */ |
25012 | 617 if (w) |
618 { | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
619 window_box (w, -1, 0, 0, &window_width, &window_height); |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
620 |
25546 | 621 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
622 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 623 } |
25546 | 624 matrix->header_line_p = header_line_p; |
25012 | 625 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
626 /* If POOL is null, MATRIX is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
627 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
25012 | 628 haven't changed. This optimization is important because preserving |
629 the matrix means preventing redisplay. */ | |
630 if (matrix->pool == NULL) | |
631 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
632 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
633 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
25012 | 634 xassert (left >= 0 && right >= 0); |
635 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
636 || right != matrix->right_margin_glyphs); | |
637 | |
638 if (!marginal_areas_changed_p | |
639 && !fonts_changed_p | |
25546 | 640 && !header_line_changed_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
641 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
642 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
25012 | 643 && matrix->window_height == window_height |
644 && matrix->window_vscroll == w->vscroll | |
645 && matrix->window_width == window_width) | |
646 return; | |
647 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
648 |
25012 | 649 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
650 if (matrix->rows_allocated < dim.height) | |
651 { | |
652 int size = dim.height * sizeof (struct glyph_row); | |
653 new_rows = dim.height - matrix->rows_allocated; | |
654 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
655 bzero (matrix->rows + matrix->rows_allocated, | |
656 new_rows * sizeof *matrix->rows); | |
657 matrix->rows_allocated = dim.height; | |
658 } | |
659 else | |
660 new_rows = 0; | |
661 | |
662 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
663 on a frame not using window-based redisplay. Set up pointers for | |
664 each row into the glyph pool. */ | |
665 if (matrix->pool) | |
666 { | |
667 xassert (matrix->pool->glyphs); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
668 |
25012 | 669 if (w) |
670 { | |
671 left = margin_glyphs_to_reserve (w, dim.width, | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
672 w->left_margin_cols); |
25012 | 673 right = margin_glyphs_to_reserve (w, dim.width, |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
674 w->right_margin_cols); |
25012 | 675 } |
676 else | |
677 left = right = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
678 |
25012 | 679 for (i = 0; i < dim.height; ++i) |
680 { | |
681 struct glyph_row *row = &matrix->rows[i]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
682 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
683 row->glyphs[LEFT_MARGIN_AREA] |
25012 | 684 = (matrix->pool->glyphs |
685 + (y + i) * matrix->pool->ncolumns | |
686 + x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
687 |
25012 | 688 if (w == NULL |
689 || row == matrix->rows + dim.height - 1 | |
25546 | 690 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 691 { |
692 row->glyphs[TEXT_AREA] | |
693 = row->glyphs[LEFT_MARGIN_AREA]; | |
694 row->glyphs[RIGHT_MARGIN_AREA] | |
695 = row->glyphs[TEXT_AREA] + dim.width; | |
696 row->glyphs[LAST_AREA] | |
697 = row->glyphs[RIGHT_MARGIN_AREA]; | |
698 } | |
699 else | |
700 { | |
701 row->glyphs[TEXT_AREA] | |
702 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
703 row->glyphs[RIGHT_MARGIN_AREA] | |
704 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
705 row->glyphs[LAST_AREA] | |
706 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
707 } | |
708 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
709 |
25012 | 710 matrix->left_margin_glyphs = left; |
711 matrix->right_margin_glyphs = right; | |
712 } | |
713 else | |
714 { | |
715 /* If MATRIX->pool is null, MATRIX is responsible for managing | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
716 its own memory. It is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
717 Allocate glyph memory from the heap. */ |
25012 | 718 if (dim.width > matrix->matrix_w |
719 || new_rows | |
25546 | 720 || header_line_changed_p |
25012 | 721 || marginal_areas_changed_p) |
722 { | |
723 struct glyph_row *row = matrix->rows; | |
724 struct glyph_row *end = row + matrix->rows_allocated; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
725 |
25012 | 726 while (row < end) |
727 { | |
728 row->glyphs[LEFT_MARGIN_AREA] | |
729 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
730 (dim.width | |
731 * sizeof (struct glyph))); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
732 |
25012 | 733 /* The mode line never has marginal areas. */ |
734 if (row == matrix->rows + dim.height - 1 | |
25546 | 735 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 736 { |
737 row->glyphs[TEXT_AREA] | |
738 = row->glyphs[LEFT_MARGIN_AREA]; | |
739 row->glyphs[RIGHT_MARGIN_AREA] | |
740 = row->glyphs[TEXT_AREA] + dim.width; | |
741 row->glyphs[LAST_AREA] | |
742 = row->glyphs[RIGHT_MARGIN_AREA]; | |
743 } | |
744 else | |
745 { | |
746 row->glyphs[TEXT_AREA] | |
747 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
748 row->glyphs[RIGHT_MARGIN_AREA] | |
749 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
750 row->glyphs[LAST_AREA] | |
751 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
752 } | |
753 ++row; | |
754 } | |
755 } | |
756 | |
757 xassert (left >= 0 && right >= 0); | |
758 matrix->left_margin_glyphs = left; | |
759 matrix->right_margin_glyphs = right; | |
760 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
761 |
25012 | 762 /* Number of rows to be used by MATRIX. */ |
763 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
764 xassert (matrix->nrows >= 0); |
25012 | 765 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
766 if (w) |
25012 | 767 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
768 if (matrix == w->current_matrix) |
25012 | 769 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
770 /* Mark rows in a current matrix of a window as not having |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
771 valid contents. It's important to not do this for |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
772 desired matrices. When Emacs starts, it may already be |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
773 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
774 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
775 window_width = window_box_width (w, -1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
776 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
777 /* Optimize the case that only the height has changed (C-x 2, |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
778 upper window). Invalidate all rows that are no longer part |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
779 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
780 if (!marginal_areas_changed_p |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
781 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
782 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
783 && dim.width == matrix->matrix_w |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
784 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
785 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
786 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
787 { |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
788 /* Find the last row in the window. */ |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
789 for (i = 0; i < matrix->nrows && matrix->rows[i].enabled_p; ++i) |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
790 if (MATRIX_ROW_BOTTOM_Y (matrix->rows + i) >= window_height) |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
791 { |
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
792 ++i; |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
793 break; |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
794 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
795 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
796 /* Window end is invalid, if inside of the rows that |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
797 are invalidated below. */ |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
798 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
799 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
801 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
802 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
803 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
804 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
805 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
806 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
807 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
808 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
809 } |
25012 | 810 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
811 else if (matrix == w->desired_matrix) |
25012 | 812 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
813 /* Rows in desired matrices always have to be cleared; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
814 redisplay expects this is the case when it runs, so it |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
815 had better be the case when we adjust matrices between |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
816 redisplays. */ |
25012 | 817 for (i = 0; i < matrix->nrows; ++i) |
818 matrix->rows[i].enabled_p = 0; | |
819 } | |
820 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
821 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
822 |
25012 | 823 /* Remember last values to be able to optimize frame redraws. */ |
824 matrix->matrix_x = x; | |
825 matrix->matrix_y = y; | |
826 matrix->matrix_w = dim.width; | |
827 matrix->matrix_h = dim.height; | |
828 | |
829 /* Record the top y location and height of W at the time the matrix | |
830 was last adjusted. This is used to optimize redisplay above. */ | |
831 if (w) | |
832 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
833 matrix->window_left_col = WINDOW_LEFT_EDGE_COL (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
834 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
25012 | 835 matrix->window_height = window_height; |
836 matrix->window_width = window_width; | |
837 matrix->window_vscroll = w->vscroll; | |
838 } | |
839 } | |
840 | |
841 | |
842 /* Reverse the contents of rows in MATRIX between START and END. The | |
843 contents of the row at END - 1 end up at START, END - 2 at START + | |
844 1 etc. This is part of the implementation of rotate_matrix (see | |
845 below). */ | |
314 | 846 |
847 static void | |
25012 | 848 reverse_rows (matrix, start, end) |
849 struct glyph_matrix *matrix; | |
850 int start, end; | |
314 | 851 { |
25012 | 852 int i, j; |
853 | |
854 for (i = start, j = end - 1; i < j; ++i, --j) | |
855 { | |
856 /* Non-ISO HP/UX compiler doesn't like auto struct | |
857 initialization. */ | |
858 struct glyph_row temp; | |
859 temp = matrix->rows[i]; | |
860 matrix->rows[i] = matrix->rows[j]; | |
861 matrix->rows[j] = temp; | |
862 } | |
314 | 863 } |
864 | |
25012 | 865 |
866 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
867 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
868 indices. (Note: this does not copy glyphs, only glyph pointers in | |
869 row structures are moved around). | |
870 | |
871 The algorithm used for rotating the vector was, I believe, first | |
872 described by Kernighan. See the vector R as consisting of two | |
873 sub-vectors AB, where A has length BY for BY >= 0. The result | |
874 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
875 and reverse the result to get (ArBr)r which is BA. Similar for | |
876 rotating right. */ | |
877 | |
878 void | |
879 rotate_matrix (matrix, first, last, by) | |
880 struct glyph_matrix *matrix; | |
881 int first, last, by; | |
314 | 882 { |
25012 | 883 if (by < 0) |
884 { | |
885 /* Up (rotate left, i.e. towards lower indices). */ | |
886 by = -by; | |
887 reverse_rows (matrix, first, first + by); | |
888 reverse_rows (matrix, first + by, last); | |
889 reverse_rows (matrix, first, last); | |
890 } | |
891 else if (by > 0) | |
314 | 892 { |
25012 | 893 /* Down (rotate right, i.e. towards higher indices). */ |
894 reverse_rows (matrix, last - by, last); | |
895 reverse_rows (matrix, first, last - by); | |
896 reverse_rows (matrix, first, last); | |
314 | 897 } |
25012 | 898 } |
899 | |
900 | |
901 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
902 with indices START <= index < END. Increment positions by DELTA/ | |
903 DELTA_BYTES. */ | |
904 | |
905 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
906 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 907 struct glyph_matrix *matrix; |
908 int start, end, delta, delta_bytes; | |
909 { | |
910 /* Check that START and END are reasonable values. */ | |
911 xassert (start >= 0 && start <= matrix->nrows); | |
912 xassert (end >= 0 && end <= matrix->nrows); | |
913 xassert (start <= end); | |
914 | |
915 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
916 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 917 } |
918 | |
919 | |
920 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
921 the row indices of the first and last + 1 row to enable. If | |
922 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
923 | |
924 void | |
925 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
926 struct glyph_matrix *matrix; | |
927 int start, end; | |
928 int enabled_p; | |
929 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
930 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
931 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
932 xassert (end >= 0 && end <= matrix->nrows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
933 |
25012 | 934 for (; start < end; ++start) |
935 matrix->rows[start].enabled_p = enabled_p != 0; | |
936 } | |
937 | |
938 | |
939 /* Clear MATRIX. | |
940 | |
941 This empties all rows in MATRIX by setting the enabled_p flag for | |
942 all rows of the matrix to zero. The function prepare_desired_row | |
943 will eventually really clear a row when it sees one with a zero | |
944 enabled_p flag. | |
945 | |
946 Resets update hints to defaults value. The only update hint | |
947 currently present is the flag MATRIX->no_scrolling_p. */ | |
948 | |
949 void | |
950 clear_glyph_matrix (matrix) | |
951 struct glyph_matrix *matrix; | |
952 { | |
953 if (matrix) | |
314 | 954 { |
25012 | 955 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
956 matrix->no_scrolling_p = 0; | |
314 | 957 } |
958 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
959 |
25012 | 960 |
961 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
962 Increment y-positions in glyph rows between START and END by DY, | |
963 and recompute their visible height. */ | |
964 | |
965 void | |
966 shift_glyph_matrix (w, matrix, start, end, dy) | |
967 struct window *w; | |
968 struct glyph_matrix *matrix; | |
969 int start, end, dy; | |
970 { | |
971 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
972 |
25012 | 973 xassert (start <= end); |
974 xassert (start >= 0 && start < matrix->nrows); | |
975 xassert (end >= 0 && end <= matrix->nrows); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
976 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
977 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
978 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
979 |
25012 | 980 for (; start < end; ++start) |
981 { | |
982 struct glyph_row *row = &matrix->rows[start]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
983 |
25012 | 984 row->y += dy; |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
985 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
986 |
25012 | 987 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
988 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
989 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
990 row->visible_height -= row->y + row->height - max_y; |
25012 | 991 } |
992 } | |
993 | |
994 | |
995 /* Mark all rows in current matrices of frame F as invalid. Marking | |
996 invalid is done by setting enabled_p to zero for all rows in a | |
997 current matrix. */ | |
998 | |
999 void | |
1000 clear_current_matrices (f) | |
1001 register struct frame *f; | |
1002 { | |
1003 /* Clear frame current matrix, if we have one. */ | |
1004 if (f->current_matrix) | |
1005 clear_glyph_matrix (f->current_matrix); | |
1006 | |
1007 /* Clear the matrix of the menu bar window, if such a window exists. | |
1008 The menu bar window is currently used to display menus on X when | |
1009 no toolkit support is compiled in. */ | |
1010 if (WINDOWP (f->menu_bar_window)) | |
1011 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1012 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1013 /* Clear the matrix of the tool-bar window, if any. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1014 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1015 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1016 |
1017 /* Clear current window matrices. */ | |
1018 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1019 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1020 } | |
1021 | |
1022 | |
1023 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1024 |
21514 | 1025 void |
25012 | 1026 clear_desired_matrices (f) |
1027 register struct frame *f; | |
314 | 1028 { |
25012 | 1029 if (f->desired_matrix) |
1030 clear_glyph_matrix (f->desired_matrix); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1031 |
25012 | 1032 if (WINDOWP (f->menu_bar_window)) |
1033 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1034 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1035 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1036 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1037 |
1038 /* Do it for window matrices. */ | |
1039 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1040 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1041 } | |
1042 | |
1043 | |
1044 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1045 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1046 | |
1047 static void | |
1048 clear_window_matrices (w, desired_p) | |
1049 struct window *w; | |
1050 int desired_p; | |
1051 { | |
1052 while (w) | |
314 | 1053 { |
25012 | 1054 if (!NILP (w->hchild)) |
1055 { | |
1056 xassert (WINDOWP (w->hchild)); | |
1057 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1058 } | |
1059 else if (!NILP (w->vchild)) | |
314 | 1060 { |
25012 | 1061 xassert (WINDOWP (w->vchild)); |
1062 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1063 } | |
1064 else | |
1065 { | |
1066 if (desired_p) | |
1067 clear_glyph_matrix (w->desired_matrix); | |
1068 else | |
314 | 1069 { |
25012 | 1070 clear_glyph_matrix (w->current_matrix); |
1071 w->window_end_valid = Qnil; | |
314 | 1072 } |
25012 | 1073 } |
1074 | |
1075 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1076 } | |
1077 } | |
1078 | |
1079 | |
1080 | |
1081 /*********************************************************************** | |
1082 Glyph Rows | |
1083 | |
1084 See dispextern.h for an overall explanation of glyph rows. | |
1085 ***********************************************************************/ | |
1086 | |
1087 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1088 changes in the glyph_row structure, i.e. addition or removal of | |
1089 structure members. */ | |
1090 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1091 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1092 |
25012 | 1093 void |
1094 clear_glyph_row (row) | |
1095 struct glyph_row *row; | |
1096 { | |
1097 struct glyph *p[1 + LAST_AREA]; | |
1098 | |
1099 /* Save pointers. */ | |
1100 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1101 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1102 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1103 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1104 | |
1105 /* Clear. */ | |
1106 *row = null_row; | |
1107 | |
1108 /* Restore pointers. */ | |
1109 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1110 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1111 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1112 row->glyphs[LAST_AREA] = p[LAST_AREA]; | |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1113 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1114 #if 0 /* At some point, some bit-fields of struct glyph were not set, |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1115 which made glyphs unequal when compared with GLYPH_EQUAL_P. |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1116 Redisplay outputs such glyphs, and flickering effects were |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1117 the result. This also depended on the contents of memory |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1118 returned by xmalloc. If flickering happens again, activate |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1119 the code below. If the flickering is gone with that, chances |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1120 are that the flickering has the same reason as here. */ |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1121 bzero (p[0], (char *) p[LAST_AREA] - (char *) p[0]); |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1122 #endif |
25012 | 1123 } |
1124 | |
1125 | |
1126 /* Make ROW an empty, enabled row of canonical character height, | |
1127 in window W starting at y-position Y. */ | |
1128 | |
1129 void | |
1130 blank_row (w, row, y) | |
1131 struct window *w; | |
1132 struct glyph_row *row; | |
1133 int y; | |
1134 { | |
1135 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1136 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1137 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1138 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1139 |
25012 | 1140 clear_glyph_row (row); |
1141 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1142 row->ascent = row->phys_ascent = 0; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1143 row->height = row->phys_height = FRAME_LINE_HEIGHT (XFRAME (w->frame)); |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1144 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1145 |
25012 | 1146 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1147 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1148 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1149 row->visible_height -= row->y + row->height - max_y; |
25012 | 1150 |
1151 row->enabled_p = 1; | |
1152 } | |
1153 | |
1154 | |
1155 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1156 are the amounts by which to change positions. Note that the first | |
1157 glyph of the text area of a row can have a buffer position even if | |
1158 the used count of the text area is zero. Such rows display line | |
1159 ends. */ | |
1160 | |
1161 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1162 increment_row_positions (row, delta, delta_bytes) |
25012 | 1163 struct glyph_row *row; |
1164 int delta, delta_bytes; | |
1165 { | |
1166 int area, i; | |
1167 | |
1168 /* Increment start and end positions. */ | |
1169 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1170 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1171 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1172 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1173 | |
65003
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1174 if (!row->enabled_p) |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1175 return; |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1176 |
25012 | 1177 /* Increment positions in glyphs. */ |
1178 for (area = 0; area < LAST_AREA; ++area) | |
1179 for (i = 0; i < row->used[area]; ++i) | |
1180 if (BUFFERP (row->glyphs[area][i].object) | |
1181 && row->glyphs[area][i].charpos > 0) | |
1182 row->glyphs[area][i].charpos += delta; | |
1183 | |
1184 /* Capture the case of rows displaying a line end. */ | |
1185 if (row->used[TEXT_AREA] == 0 | |
1186 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1187 row->glyphs[TEXT_AREA]->charpos += delta; | |
1188 } | |
1189 | |
1190 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1191 #if 0 |
25012 | 1192 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1193 contents, i.e. glyph structure contents are exchanged between A and | |
1194 B without changing glyph pointers in A and B. */ | |
1195 | |
1196 static void | |
1197 swap_glyphs_in_rows (a, b) | |
1198 struct glyph_row *a, *b; | |
1199 { | |
1200 int area; | |
1201 | |
1202 for (area = 0; area < LAST_AREA; ++area) | |
1203 { | |
1204 /* Number of glyphs to swap. */ | |
1205 int max_used = max (a->used[area], b->used[area]); | |
1206 | |
1207 /* Start of glyphs in area of row A. */ | |
1208 struct glyph *glyph_a = a->glyphs[area]; | |
1209 | |
1210 /* End + 1 of glyphs in area of row A. */ | |
1211 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1212 | |
1213 /* Start of glyphs in area of row B. */ | |
1214 struct glyph *glyph_b = b->glyphs[area]; | |
1215 | |
1216 while (glyph_a < glyph_a_end) | |
1217 { | |
1218 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1219 initialization. */ | |
1220 struct glyph temp; | |
1221 temp = *glyph_a; | |
1222 *glyph_a = *glyph_b; | |
1223 *glyph_b = temp; | |
1224 ++glyph_a; | |
1225 ++glyph_b; | |
314 | 1226 } |
1227 } | |
1228 } | |
25012 | 1229 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1230 #endif /* 0 */ |
25012 | 1231 |
1232 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1233 | |
1234 static INLINE void | |
1235 swap_glyph_pointers (a, b) | |
1236 struct glyph_row *a, *b; | |
1237 { | |
1238 int i; | |
1239 for (i = 0; i < LAST_AREA + 1; ++i) | |
1240 { | |
1241 struct glyph *temp = a->glyphs[i]; | |
1242 a->glyphs[i] = b->glyphs[i]; | |
1243 b->glyphs[i] = temp; | |
1244 } | |
1245 } | |
1246 | |
1247 | |
1248 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1249 that glyph pointers in the structures are left unchanged. */ | |
1250 | |
1251 INLINE void | |
1252 copy_row_except_pointers (to, from) | |
1253 struct glyph_row *to, *from; | |
1254 { | |
1255 struct glyph *pointers[1 + LAST_AREA]; | |
1256 | |
1257 /* Save glyph pointers of TO. */ | |
1258 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1259 | |
1260 /* Do a structure assignment. */ | |
1261 *to = *from; | |
1262 | |
1263 /* Restore original pointers of TO. */ | |
1264 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1265 } | |
1266 | |
1267 | |
1268 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1269 TO and FROM are left unchanged. Glyph contents are copied from the | |
1270 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1271 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1272 | |
1273 void | |
1274 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1275 struct glyph_row *to, *from; | |
1276 int delta, delta_bytes; | |
1277 { | |
1278 int area; | |
1279 | |
1280 /* This is like a structure assignment TO = FROM, except that | |
1281 glyph pointers in the rows are left unchanged. */ | |
1282 copy_row_except_pointers (to, from); | |
1283 | |
1284 /* Copy glyphs from FROM to TO. */ | |
1285 for (area = 0; area < LAST_AREA; ++area) | |
1286 if (from->used[area]) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1287 bcopy (from->glyphs[area], to->glyphs[area], |
25012 | 1288 from->used[area] * sizeof (struct glyph)); |
1289 | |
1290 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1291 increment_row_positions (to, delta, delta_bytes); |
25012 | 1292 } |
1293 | |
1294 | |
1295 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1296 assignment TO = FROM, except that glyph pointers are not copied but | |
1297 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1298 a memory leak. */ | |
1299 | |
1300 static INLINE void | |
1301 assign_row (to, from) | |
1302 struct glyph_row *to, *from; | |
1303 { | |
1304 swap_glyph_pointers (to, from); | |
1305 copy_row_except_pointers (to, from); | |
1306 } | |
1307 | |
1308 | |
1309 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1310 a row in a window matrix, is a slice of the glyph memory of the | |
1311 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1312 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1313 memory of FRAME_ROW. */ | |
1314 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1315 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1316 |
25012 | 1317 static int |
1318 glyph_row_slice_p (window_row, frame_row) | |
1319 struct glyph_row *window_row, *frame_row; | |
1320 { | |
1321 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1322 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1323 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1324 | |
1325 return (frame_glyph_start <= window_glyph_start | |
1326 && window_glyph_start < frame_glyph_end); | |
1327 } | |
1328 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1329 #endif /* GLYPH_DEBUG */ |
25012 | 1330 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1331 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1332 |
25012 | 1333 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1334 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1335 in WINDOW_MATRIX is found satisfying the condition. */ | |
1336 | |
1337 static struct glyph_row * | |
1338 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1339 struct glyph_matrix *window_matrix, *frame_matrix; | |
1340 int row; | |
1341 { | |
1342 int i; | |
1343 | |
1344 xassert (row >= 0 && row < frame_matrix->nrows); | |
1345 | |
1346 for (i = 0; i < window_matrix->nrows; ++i) | |
1347 if (glyph_row_slice_p (window_matrix->rows + i, | |
1348 frame_matrix->rows + row)) | |
1349 break; | |
1350 | |
1351 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1352 } | |
1353 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1354 #endif /* 0 */ |
25012 | 1355 |
1356 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1357 i.e. they are only marked as to be cleared by setting their | |
1358 enabled_p flag to zero. When a row is to be displayed, a prior | |
1359 call to this function really clears it. */ | |
1360 | |
1361 void | |
1362 prepare_desired_row (row) | |
1363 struct glyph_row *row; | |
1364 { | |
1365 if (!row->enabled_p) | |
1366 { | |
1367 clear_glyph_row (row); | |
1368 row->enabled_p = 1; | |
1369 } | |
1370 } | |
1371 | |
1372 | |
1373 /* Return a hash code for glyph row ROW. */ | |
1374 | |
1375 int | |
1376 line_hash_code (row) | |
1377 struct glyph_row *row; | |
1378 { | |
1379 int hash = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1380 |
25012 | 1381 if (row->enabled_p) |
1382 { | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1383 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
|
1384 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
|
1385 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1386 while (glyph < end) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1387 { |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1388 int c = glyph->u.ch; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1389 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
|
1390 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
|
1391 c -= SPACEGLYPH; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1392 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
|
1393 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
|
1394 ++glyph; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1395 } |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1396 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1397 if (hash == 0) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1398 hash = 1; |
25012 | 1399 } |
1400 | |
1401 return hash; | |
1402 } | |
1403 | |
1404 | |
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
|
1405 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
25012 | 1406 the number of characters in the line. If must_write_spaces is |
1407 zero, leading and trailing spaces are ignored. */ | |
1408 | |
1409 static unsigned int | |
1410 line_draw_cost (matrix, vpos) | |
1411 struct glyph_matrix *matrix; | |
1412 int vpos; | |
1413 { | |
1414 struct glyph_row *row = matrix->rows + vpos; | |
1415 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1416 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1417 int len; | |
1418 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1419 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1420 | |
1421 /* 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
|
1422 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
25012 | 1423 { |
1424 /* 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
|
1425 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1426 --end; |
1427 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1428 /* All blank line. */ |
25012 | 1429 if (end == beg) |
1430 return 0; | |
1431 | |
1432 /* Skip over leading spaces. */ | |
1433 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1434 ++beg; | |
1435 } | |
1436 | |
1437 /* If we don't have a glyph-table, each glyph is one character, | |
1438 so return the number of glyphs. */ | |
1439 if (glyph_table_base == 0) | |
1440 len = end - beg; | |
1441 else | |
1442 { | |
1443 /* Otherwise, scan the glyphs and accumulate their total length | |
1444 in LEN. */ | |
1445 len = 0; | |
1446 while (beg < end) | |
1447 { | |
1448 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1449 |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1450 if (g < 0 |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1451 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1452 len += 1; |
1453 else | |
1454 len += GLYPH_LENGTH (glyph_table_base, g); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1455 |
25012 | 1456 ++beg; |
1457 } | |
1458 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1459 |
25012 | 1460 return len; |
1461 } | |
1462 | |
1463 | |
1464 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1465 and B have equal contents. W is the window to which the glyphs | |
1466 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
|
1467 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
|
1468 flags of A and B, too. */ |
25012 | 1469 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1470 static INLINE int |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1471 row_equal_p (w, a, b, mouse_face_p) |
25012 | 1472 struct window *w; |
1473 struct glyph_row *a, *b; | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1474 int mouse_face_p; |
25012 | 1475 { |
1476 if (a == b) | |
1477 return 1; | |
1478 else if (a->hash != b->hash) | |
1479 return 0; | |
1480 else | |
1481 { | |
1482 struct glyph *a_glyph, *b_glyph, *a_end; | |
1483 int area; | |
1484 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1485 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
|
1486 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1487 |
25012 | 1488 /* Compare glyphs. */ |
1489 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1490 { | |
1491 if (a->used[area] != b->used[area]) | |
1492 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1493 |
25012 | 1494 a_glyph = a->glyphs[area]; |
1495 a_end = a_glyph + a->used[area]; | |
1496 b_glyph = b->glyphs[area]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1497 |
25012 | 1498 while (a_glyph < a_end |
1499 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1500 ++a_glyph, ++b_glyph; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1501 |
25012 | 1502 if (a_glyph != a_end) |
1503 return 0; | |
1504 } | |
1505 | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1506 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
|
1507 || 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
|
1508 || 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
|
1509 || 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
|
1510 || 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
|
1511 || 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
|
1512 || 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
|
1513 || 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
|
1514 || a->overlapped_p != b->overlapped_p |
25012 | 1515 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1516 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1517 /* Different partially visible characters on left margin. */ | |
1518 || a->x != b->x | |
1519 /* Different height. */ | |
1520 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1521 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1522 || a->phys_height != b->phys_height |
25012 | 1523 || a->visible_height != b->visible_height) |
1524 return 0; | |
1525 } | |
1526 | |
1527 return 1; | |
1528 } | |
1529 | |
1530 | |
314 | 1531 |
25012 | 1532 /*********************************************************************** |
1533 Glyph Pool | |
1534 | |
1535 See dispextern.h for an overall explanation of glyph pools. | |
1536 ***********************************************************************/ | |
1537 | |
1538 /* Allocate a glyph_pool structure. The structure returned is | |
1539 initialized with zeros. The global variable glyph_pool_count is | |
1540 incremented for each pool allocated. */ | |
1541 | |
1542 static struct glyph_pool * | |
1543 new_glyph_pool () | |
1544 { | |
1545 struct glyph_pool *result; | |
1546 | |
1547 /* Allocate a new glyph_pool and clear it. */ | |
1548 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1549 bzero (result, sizeof *result); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1550 |
25012 | 1551 /* For memory leak and double deletion checking. */ |
1552 ++glyph_pool_count; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1553 |
25012 | 1554 return result; |
1555 } | |
1556 | |
1557 | |
1558 /* Free a glyph_pool structure POOL. The function may be called with | |
1559 a null POOL pointer. The global variable glyph_pool_count is | |
1560 decremented with every pool structure freed. If this count gets | |
1561 negative, more structures were freed than allocated, i.e. one | |
1562 structure must have been freed more than once or a bogus pointer | |
1563 was passed to free_glyph_pool. */ | |
1564 | |
1565 static void | |
1566 free_glyph_pool (pool) | |
1567 struct glyph_pool *pool; | |
1568 { | |
1569 if (pool) | |
1570 { | |
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
|
1571 /* More freed than allocated? */ |
25012 | 1572 --glyph_pool_count; |
1573 xassert (glyph_pool_count >= 0); | |
1574 | |
1575 xfree (pool->glyphs); | |
1576 xfree (pool); | |
1577 } | |
1578 } | |
1579 | |
1580 | |
1581 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1582 columns we need. This function never shrinks a pool. The only | |
1583 case in which this would make sense, would be when a frame's size | |
1584 is changed from a large value to a smaller one. But, if someone | |
1585 does it once, we can expect that he will do it again. | |
1586 | |
1587 Value is non-zero if the pool changed in a way which makes | |
1588 re-adjusting window glyph matrices necessary. */ | |
1589 | |
1590 static int | |
1591 realloc_glyph_pool (pool, matrix_dim) | |
1592 struct glyph_pool *pool; | |
1593 struct dim matrix_dim; | |
1594 { | |
1595 int needed; | |
1596 int changed_p; | |
1597 | |
1598 changed_p = (pool->glyphs == 0 | |
1599 || matrix_dim.height != pool->nrows | |
1600 || matrix_dim.width != pool->ncolumns); | |
1601 | |
1602 /* Enlarge the glyph pool. */ | |
1603 needed = matrix_dim.width * matrix_dim.height; | |
1604 if (needed > pool->nglyphs) | |
1605 { | |
1606 int size = needed * sizeof (struct glyph); | |
1607 | |
1608 if (pool->glyphs) | |
1609 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1610 else | |
1611 { | |
1612 pool->glyphs = (struct glyph *) xmalloc (size); | |
1613 bzero (pool->glyphs, size); | |
1614 } | |
1615 | |
1616 pool->nglyphs = needed; | |
1617 } | |
1618 | |
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
|
1619 /* Remember the number of rows and columns because (a) we use them |
25012 | 1620 to do sanity checks, and (b) the number of columns determines |
1621 where rows in the frame matrix start---this must be available to | |
1622 determine pointers to rows of window sub-matrices. */ | |
1623 pool->nrows = matrix_dim.height; | |
1624 pool->ncolumns = matrix_dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1625 |
25012 | 1626 return changed_p; |
1627 } | |
1628 | |
1629 | |
1630 | |
1631 /*********************************************************************** | |
1632 Debug Code | |
1633 ***********************************************************************/ | |
1634 | |
1635 #if GLYPH_DEBUG | |
1636 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1637 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1638 /* 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
|
1639 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
|
1640 stdout. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1641 */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1642 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1643 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1644 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1645 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1646 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1647 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1648 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1649 |
25012 | 1650 /* Check that no glyph pointers have been lost in MATRIX. If a |
1651 pointer has been lost, e.g. by using a structure assignment between | |
1652 rows, at least one pointer must occur more than once in the rows of | |
1653 MATRIX. */ | |
1654 | |
1655 void | |
1656 check_matrix_pointer_lossage (matrix) | |
1657 struct glyph_matrix *matrix; | |
1658 { | |
1659 int i, j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1660 |
25012 | 1661 for (i = 0; i < matrix->nrows; ++i) |
1662 for (j = 0; j < matrix->nrows; ++j) | |
1663 xassert (i == j | |
1664 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1665 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1666 } | |
1667 | |
1668 | |
1669 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1670 | |
1671 struct glyph_row * | |
1672 matrix_row (matrix, row) | |
1673 struct glyph_matrix *matrix; | |
1674 int row; | |
1675 { | |
1676 xassert (matrix && matrix->rows); | |
1677 xassert (row >= 0 && row < matrix->nrows); | |
1678 | |
1679 /* That's really too slow for normal testing because this function | |
1680 is called almost everywhere. Although---it's still astonishingly | |
1681 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1682 #if 0 |
25012 | 1683 check_matrix_pointer_lossage (matrix); |
1684 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1685 |
25012 | 1686 return matrix->rows + row; |
1687 } | |
1688 | |
1689 | |
1690 #if 0 /* This function makes invalid assumptions when text is | |
1691 partially invisible. But it might come handy for debugging | |
1692 nevertheless. */ | |
1693 | |
1694 /* Check invariants that must hold for an up to date current matrix of | |
1695 window W. */ | |
1696 | |
1697 static void | |
1698 check_matrix_invariants (w) | |
314 | 1699 struct window *w; |
1700 { | |
25012 | 1701 struct glyph_matrix *matrix = w->current_matrix; |
1702 int yb = window_text_bottom_y (w); | |
1703 struct glyph_row *row = matrix->rows; | |
1704 struct glyph_row *last_text_row = NULL; | |
1705 struct buffer *saved = current_buffer; | |
1706 struct buffer *buffer = XBUFFER (w->buffer); | |
1707 int c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1708 |
25012 | 1709 /* This can sometimes happen for a fresh window. */ |
1710 if (matrix->nrows < 2) | |
1711 return; | |
1712 | |
1713 set_buffer_temp (buffer); | |
1714 | |
1715 /* Note: last row is always reserved for the mode line. */ | |
1716 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1717 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1718 { | |
1719 struct glyph_row *next = row + 1; | |
1720 | |
1721 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1722 last_text_row = row; | |
1723 | |
1724 /* Check that character and byte positions are in sync. */ | |
1725 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1726 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1727 | |
1728 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1729 have such a position temporarily in case of a minibuffer | |
1730 displaying something like `[Sole completion]' at its end. */ | |
1731 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1732 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1733 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1734 | |
1735 /* Check that end position of `row' is equal to start position | |
1736 of next row. */ | |
1737 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1738 { | |
1739 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1740 == MATRIX_ROW_START_CHARPOS (next)); | |
1741 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1742 == MATRIX_ROW_START_BYTEPOS (next)); | |
1743 } | |
1744 row = next; | |
1745 } | |
1746 | |
1747 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1748 xassert (w->desired_matrix->rows != NULL); | |
1749 set_buffer_temp (saved); | |
1750 } | |
1751 | |
1752 #endif /* 0 */ | |
1753 | |
1754 #endif /* GLYPH_DEBUG != 0 */ | |
1755 | |
1756 | |
1757 | |
1758 /********************************************************************** | |
1759 Allocating/ Adjusting Glyph Matrices | |
1760 **********************************************************************/ | |
1761 | |
1762 /* Allocate glyph matrices over a window tree for a frame-based | |
1763 redisplay | |
1764 | |
1765 X and Y are column/row within the frame glyph matrix where | |
1766 sub-matrices for the window tree rooted at WINDOW must be | |
1767 allocated. CH_DIM contains the dimensions of the smallest | |
1768 character that could be used during display. DIM_ONLY_P non-zero | |
1769 means that the caller of this function is only interested in the | |
1770 result matrix dimension, and matrix adjustments should not be | |
1771 performed. | |
1772 | |
1773 The function returns the total width/height of the sub-matrices of | |
1774 the window tree. If called on a frame root window, the computation | |
1775 will take the mini-buffer window into account. | |
1776 | |
1777 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1778 | |
1779 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1780 glyph matrices yet, and | |
1781 | |
1782 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1783 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
|
1784 DIM_ONLY_P) |
25012 | 1785 |
1786 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1787 function. | |
1788 | |
1789 Windows are arranged into chains of windows on the same level | |
1790 through the next fields of window structures. Such a level can be | |
1791 either a sequence of horizontally adjacent windows from left to | |
1792 right, or a sequence of vertically adjacent windows from top to | |
1793 bottom. Each window in a horizontal sequence can be either a leaf | |
1794 window or a vertical sequence; a window in a vertical sequence can | |
1795 be either a leaf or a horizontal sequence. All windows in a | |
1796 horizontal sequence have the same height, and all windows in a | |
1797 vertical sequence have the same width. | |
1798 | |
1799 This function uses, for historical reasons, a more general | |
1800 algorithm to determine glyph matrix dimensions that would be | |
1801 necessary. | |
1802 | |
1803 The matrix height of a horizontal sequence is determined by the | |
1804 maximum height of any matrix in the sequence. The matrix width of | |
1805 a horizontal sequence is computed by adding up matrix widths of | |
1806 windows in the sequence. | |
1807 | |
1808 |<------- result width ------->| | |
1809 +---------+----------+---------+ --- | |
1810 | | | | | | |
1811 | | | | | |
1812 +---------+ | | result height | |
1813 | +---------+ | |
1814 | | | | |
1815 +----------+ --- | |
1816 | |
1817 The matrix width of a vertical sequence is the maximum matrix width | |
1818 of any window in the sequence. Its height is computed by adding up | |
1819 matrix heights of windows in the sequence. | |
1820 | |
1821 |<---- result width -->| | |
1822 +---------+ --- | |
1823 | | | | |
1824 | | | | |
1825 +---------+--+ | | |
1826 | | | | |
1827 | | result height | |
1828 | | | |
1829 +------------+---------+ | | |
1830 | | | | |
1831 | | | | |
1832 +------------+---------+ --- */ | |
1833 | |
1834 /* Bit indicating that a new matrix will be allocated or has been | |
1835 allocated. */ | |
1836 | |
1837 #define NEW_LEAF_MATRIX (1 << 0) | |
1838 | |
1839 /* Bit indicating that a matrix will or has changed its location or | |
1840 size. */ | |
1841 | |
1842 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1843 | |
1844 static struct dim | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1845 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
|
1846 window_change_flags) |
25012 | 1847 Lisp_Object window; |
1848 int x, y; | |
1849 int dim_only_p; | |
1850 int *window_change_flags; | |
1851 { | |
1852 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1853 int x0 = x, y0 = y; | |
1854 int wmax = 0, hmax = 0; | |
1855 struct dim total; | |
1856 struct dim dim; | |
1857 struct window *w; | |
1858 int in_horz_combination_p; | |
1859 | |
1860 /* What combination is WINDOW part of? Compute this once since the | |
1861 result is the same for all windows in the `next' chain. The | |
1862 special case of a root window (parent equal to nil) is treated | |
1863 like a vertical combination because a root window's `next' | |
1864 points to the mini-buffer window, if any, which is arranged | |
1865 vertically below other windows. */ | |
1866 in_horz_combination_p | |
1867 = (!NILP (XWINDOW (window)->parent) | |
1868 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1869 | |
1870 /* For WINDOW and all windows on the same level. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1871 do |
25012 | 1872 { |
1873 w = XWINDOW (window); | |
1874 | |
1875 /* 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
|
1876 on whether this is a combination or a leaf window. */ |
25012 | 1877 if (!NILP (w->hchild)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1878 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
25012 | 1879 dim_only_p, |
1880 window_change_flags); | |
1881 else if (!NILP (w->vchild)) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1882 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
25012 | 1883 dim_only_p, |
1884 window_change_flags); | |
1885 else | |
1886 { | |
1887 /* If not already done, allocate sub-matrix structures. */ | |
1888 if (w->desired_matrix == NULL) | |
1889 { | |
1890 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1891 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1892 *window_change_flags |= NEW_LEAF_MATRIX; | |
1893 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1894 |
25012 | 1895 /* Width and height MUST be chosen so that there are no |
1896 holes in the frame matrix. */ | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1897 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1898 dim.height = required_matrix_height (w); |
25012 | 1899 |
1900 /* Will matrix be re-allocated? */ | |
1901 if (x != w->desired_matrix->matrix_x | |
1902 || y != w->desired_matrix->matrix_y | |
1903 || dim.width != w->desired_matrix->matrix_w | |
1904 || dim.height != w->desired_matrix->matrix_h | |
1905 || (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
|
1906 w->left_margin_cols) |
25012 | 1907 != w->desired_matrix->left_margin_glyphs) |
1908 || (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
|
1909 w->right_margin_cols) |
25012 | 1910 != w->desired_matrix->right_margin_glyphs)) |
1911 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1912 | |
1913 /* Actually change matrices, if allowed. Do not consider | |
1914 CHANGED_LEAF_MATRIX computed above here because the pool | |
1915 may have been changed which we don't now here. We trust | |
1916 that we only will be called with DIM_ONLY_P != 0 when | |
1917 necessary. */ | |
1918 if (!dim_only_p) | |
1919 { | |
1920 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1921 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1922 } | |
1923 } | |
1924 | |
1925 /* If we are part of a horizontal combination, advance x for | |
1926 windows to the right of W; otherwise advance y for windows | |
1927 below W. */ | |
1928 if (in_horz_combination_p) | |
1929 x += dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1930 else |
25012 | 1931 y += dim.height; |
1932 | |
1933 /* Remember maximum glyph matrix dimensions. */ | |
1934 wmax = max (wmax, dim.width); | |
1935 hmax = max (hmax, dim.height); | |
1936 | |
1937 /* Next window on same level. */ | |
1938 window = w->next; | |
1939 } | |
1940 while (!NILP (window)); | |
1941 | |
1942 /* Set `total' to the total glyph matrix dimension of this window | |
1943 level. In a vertical combination, the width is the width of the | |
1944 widest window; the height is the y we finally reached, corrected | |
1945 by the y we started with. In a horizontal combination, the total | |
1946 height is the height of the tallest window, and the width is the | |
1947 x we finally reached, corrected by the x we started with. */ | |
1948 if (in_horz_combination_p) | |
1949 { | |
1950 total.width = x - x0; | |
1951 total.height = hmax; | |
1952 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1953 else |
25012 | 1954 { |
1955 total.width = wmax; | |
1956 total.height = y - y0; | |
1957 } | |
1958 | |
1959 return total; | |
1960 } | |
1961 | |
1962 | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1963 /* 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
|
1964 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1965 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1966 required_matrix_height (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1967 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1968 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1969 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1970 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1971 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1972 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1973 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1974 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1975 int window_pixel_height = window_box_height (w) + abs (w->vscroll); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1976 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
|
1977 / ch_height) * w->nrows_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1978 /* 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
|
1979 bottom of the window. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1980 + 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
|
1981 /* 2 for header and mode line. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1982 + 2); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1983 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1984 #endif /* HAVE_WINDOW_SYSTEM */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1985 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1986 return WINDOW_TOTAL_LINES (w); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1987 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1988 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1989 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 /* 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
|
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_width (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); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1998 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1999 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2000 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
|
2001 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2002 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2003 /* 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
|
2004 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
|
2005 / ch_width) * w->ncols_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 /* 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
|
2007 + 2 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2008 /* One partially visible column at the right |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2009 edge of each marginal area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2010 + 1 + 1); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2011 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2012 #endif /* HAVE_WINDOW_SYSTEM */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2013 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2014 return XINT (w->total_cols); |
39448
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 |
25012 | 2018 /* Allocate window matrices for window-based redisplay. W is the |
2019 window whose matrices must be allocated/reallocated. CH_DIM is the | |
2020 size of the smallest character that could potentially be used on W. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2021 |
25012 | 2022 static void |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2023 allocate_matrices_for_window_redisplay (w) |
25012 | 2024 struct window *w; |
2025 { | |
2026 while (w) | |
314 | 2027 { |
25012 | 2028 if (!NILP (w->vchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2029 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
25012 | 2030 else if (!NILP (w->hchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2031 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
25012 | 2032 else |
314 | 2033 { |
25012 | 2034 /* W is a leaf window. */ |
2035 struct dim dim; | |
2036 | |
2037 /* If matrices are not yet allocated, allocate them now. */ | |
2038 if (w->desired_matrix == NULL) | |
314 | 2039 { |
25012 | 2040 w->desired_matrix = new_glyph_matrix (NULL); |
2041 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 2042 } |
25012 | 2043 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2044 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2045 dim.height = required_matrix_height (w); |
25012 | 2046 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
2047 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2048 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2049 |
25012 | 2050 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
2051 } | |
2052 } | |
2053 | |
2054 | |
2055 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2056 do it for all frames; otherwise do it just for the given frame. | |
2057 This function must be called when a new frame is created, its size | |
2058 changes, or its window configuration changes. */ | |
2059 | |
2060 void | |
2061 adjust_glyphs (f) | |
2062 struct frame *f; | |
2063 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2064 /* 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
|
2065 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
|
2066 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2067 |
25012 | 2068 if (f) |
2069 adjust_frame_glyphs (f); | |
2070 else | |
2071 { | |
2072 Lisp_Object tail, lisp_frame; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2073 |
25012 | 2074 FOR_EACH_FRAME (tail, lisp_frame) |
2075 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2076 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2077 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2078 UNBLOCK_INPUT; |
25012 | 2079 } |
2080 | |
2081 | |
2082 /* Adjust frame glyphs when Emacs is initialized. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2083 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2084 To be called from init_display. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2085 |
25012 | 2086 We need a glyph matrix because redraw will happen soon. |
2087 Unfortunately, window sizes on selected_frame are not yet set to | |
2088 meaningful values. I believe we can assume that there are only two | |
2089 windows on the frame---the mini-buffer and the root window. Frame | |
2090 height and width seem to be correct so far. So, set the sizes of | |
2091 windows to estimated values. */ | |
2092 | |
2093 static void | |
2094 adjust_frame_glyphs_initially () | |
2095 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2096 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2097 struct window *root = XWINDOW (sf->root_window); |
25012 | 2098 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
|
2099 int frame_lines = FRAME_LINES (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2100 int frame_cols = FRAME_COLS (sf); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2101 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2102 |
2103 /* 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
|
2104 XSETFASTINT (root->top_line, top_margin); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2105 XSETFASTINT (root->total_cols, frame_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2106 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
25012 | 2107 |
2108 /* 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
|
2109 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
|
2110 XSETFASTINT (mini->total_cols, frame_cols); |
25012 | 2111 set_window_height (root->next, 1, 0); |
2112 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2113 adjust_frame_glyphs (sf); |
25012 | 2114 glyphs_initialized_initially_p = 1; |
2115 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2116 |
25012 | 2117 |
2118 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2119 | |
2120 static void | |
2121 adjust_frame_glyphs (f) | |
2122 struct frame *f; | |
2123 { | |
2124 if (FRAME_WINDOW_P (f)) | |
2125 adjust_frame_glyphs_for_window_redisplay (f); | |
2126 else | |
2127 adjust_frame_glyphs_for_frame_redisplay (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2128 |
25012 | 2129 /* Don't forget the message buffer and the buffer for |
2130 decode_mode_spec. */ | |
2131 adjust_frame_message_buffer (f); | |
2132 adjust_decode_mode_spec_buffer (f); | |
2133 | |
2134 f->glyphs_initialized_p = 1; | |
2135 } | |
2136 | |
2137 | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2138 /* 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
|
2139 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2140 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2141 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2142 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2143 Lisp_Object window; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2144 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2145 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2146 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2147 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2148 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2149 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2150 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2151 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2152 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2154 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2155 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2156 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2157 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2158 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2159 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2160 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2161 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2162 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
|
2163 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2164 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2165 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
|
2166 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2167 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
|
2168 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
|
2169 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2170 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
|
2171 && 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
|
2172 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2173 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2174 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2175 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2176 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
|
2177 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
|
2178 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2179 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2180 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2181 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2182 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2183 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2184 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2185 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2186 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2188 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2189 /* 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
|
2190 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
|
2191 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2192 static struct glyph_matrix * |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2193 save_current_matrix (f) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2194 struct frame *f; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2195 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2196 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2197 struct glyph_matrix *saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2198 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2199 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2200 bzero (saved, sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2201 saved->nrows = f->current_matrix->nrows; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2202 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
|
2203 * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2204 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
|
2205 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2206 for (i = 0; i < saved->nrows; ++i) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2207 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2208 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
|
2209 struct glyph_row *to = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2210 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
|
2211 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
|
2212 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
|
2213 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
|
2214 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2215 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2216 return saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2217 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2218 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2219 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2220 /* 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
|
2221 and free memory associated with SAVED. */ |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2222 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2223 static void |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2224 restore_current_matrix (f, saved) |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2225 struct frame *f; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2226 struct glyph_matrix *saved; |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2227 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2228 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2229 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2230 for (i = 0; i < saved->nrows; ++i) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2231 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2232 struct glyph_row *from = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2233 struct glyph_row *to = f->current_matrix->rows + i; |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2234 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2235 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2236 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
|
2237 xfree (from->glyphs[TEXT_AREA]); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2238 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2239 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2240 xfree (saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2241 xfree (saved); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2242 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2243 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2244 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2245 |
25012 | 2246 /* Allocate/reallocate glyph matrices of a single frame F for |
2247 frame-based redisplay. */ | |
2248 | |
2249 static void | |
2250 adjust_frame_glyphs_for_frame_redisplay (f) | |
2251 struct frame *f; | |
2252 { | |
2253 struct dim ch_dim; | |
2254 struct dim matrix_dim; | |
2255 int pool_changed_p; | |
2256 int window_change_flags; | |
2257 int top_window_y; | |
2258 | |
2259 if (!FRAME_LIVE_P (f)) | |
2260 return; | |
2261 | |
2262 /* Determine the smallest character in any font for F. On | |
2263 console windows, all characters have dimension (1, 1). */ | |
2264 ch_dim.width = ch_dim.height = 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2265 |
25012 | 2266 top_window_y = FRAME_TOP_MARGIN (f); |
2267 | |
2268 /* Allocate glyph pool structures if not already done. */ | |
2269 if (f->desired_pool == NULL) | |
2270 { | |
2271 f->desired_pool = new_glyph_pool (); | |
2272 f->current_pool = new_glyph_pool (); | |
2273 } | |
2274 | |
2275 /* Allocate frames matrix structures if needed. */ | |
2276 if (f->desired_matrix == NULL) | |
2277 { | |
2278 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2279 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2280 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2281 |
25012 | 2282 /* Compute window glyph matrices. (This takes the mini-buffer |
2283 window into account). The result is the size of the frame glyph | |
2284 matrix needed. The variable window_change_flags is set to a bit | |
2285 mask indicating whether new matrices will be allocated or | |
2286 existing matrices change their size or location within the frame | |
2287 matrix. */ | |
2288 window_change_flags = 0; | |
2289 matrix_dim | |
2290 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2291 0, top_window_y, | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2292 1, |
25012 | 2293 &window_change_flags); |
2294 | |
2295 /* Add in menu bar lines, if any. */ | |
2296 matrix_dim.height += top_window_y; | |
2297 | |
2298 /* Enlarge pools as necessary. */ | |
2299 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2300 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2301 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2302 /* Set up glyph pointers within window matrices. Do this only if |
25012 | 2303 absolutely necessary since it requires a frame redraw. */ |
2304 if (pool_changed_p || window_change_flags) | |
2305 { | |
2306 /* Do it for window matrices. */ | |
2307 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
|
2308 0, top_window_y, 0, |
25012 | 2309 &window_change_flags); |
2310 | |
2311 /* Size of frame matrices must equal size of frame. Note | |
2312 that we are called for X frames with window widths NOT equal | |
2313 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
|
2314 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
|
2315 && matrix_dim.height == FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2316 |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2317 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2318 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
|
2319 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2320 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2321 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
|
2322 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
|
2323 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
|
2324 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
|
2325 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2326 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2327 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2328 && matrix_dim.width == f->current_matrix->matrix_w |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2329 && matrix_dim.height == f->current_matrix->matrix_h) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2330 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2331 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
|
2332 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
|
2333 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
|
2334 restore_current_matrix (f, copy); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2335 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2336 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2337 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2338 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2339 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
|
2340 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
|
2341 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2342 } |
25012 | 2343 } |
2344 } | |
2345 | |
2346 | |
2347 /* Allocate/reallocate glyph matrices of a single frame F for | |
2348 window-based redisplay. */ | |
2349 | |
2350 static void | |
2351 adjust_frame_glyphs_for_window_redisplay (f) | |
2352 struct frame *f; | |
2353 { | |
2354 struct dim ch_dim; | |
2355 struct window *w; | |
2356 | |
2357 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2358 |
25012 | 2359 /* Get minimum sizes. */ |
2360 #ifdef HAVE_WINDOW_SYSTEM | |
2361 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); | |
2362 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f); | |
2363 #else | |
2364 ch_dim.width = ch_dim.height = 1; | |
2365 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2366 |
25012 | 2367 /* Allocate/reallocate window matrices. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2368 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
25012 | 2369 |
2370 /* Allocate/ reallocate matrices of the dummy window used to display | |
2371 the menu bar under X when no X toolkit support is available. */ | |
49322 | 2372 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
25012 | 2373 { |
2374 /* Allocate a dummy window if not already done. */ | |
2375 if (NILP (f->menu_bar_window)) | |
2376 { | |
2377 f->menu_bar_window = make_window (); | |
2378 w = XWINDOW (f->menu_bar_window); | |
2379 XSETFRAME (w->frame, f); | |
2380 w->pseudo_window_p = 1; | |
2381 } | |
2382 else | |
2383 w = XWINDOW (f->menu_bar_window); | |
2384 | |
2385 /* Set window dimensions to frame dimensions and allocate or | |
2386 adjust glyph matrices of W. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2387 XSETFASTINT (w->top_line, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2388 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2389 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
|
2390 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
|
2391 allocate_matrices_for_window_redisplay (w); |
25012 | 2392 } |
2393 #endif /* not USE_X_TOOLKIT */ | |
2394 | |
49322 | 2395 #ifndef USE_GTK |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2396 /* 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
|
2397 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
|
2398 if (NILP (f->tool_bar_window)) |
25012 | 2399 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2400 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
|
2401 w = XWINDOW (f->tool_bar_window); |
25012 | 2402 XSETFRAME (w->frame, f); |
2403 w->pseudo_window_p = 1; | |
2404 } | |
2405 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2406 w = XWINDOW (f->tool_bar_window); |
25012 | 2407 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2408 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
|
2409 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2410 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
|
2411 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
|
2412 allocate_matrices_for_window_redisplay (w); |
49322 | 2413 #endif |
25012 | 2414 } |
2415 | |
2416 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2417 /* Adjust/ allocate message buffer of frame F. |
25012 | 2418 |
2419 Note that the message buffer is never freed. Since I could not | |
2420 find a free in 19.34, I assume that freeing it would be | |
2421 problematic in some way and don't do it either. | |
2422 | |
2423 (Implementation note: It should be checked if we can free it | |
2424 eventually without causing trouble). */ | |
2425 | |
2426 static void | |
2427 adjust_frame_message_buffer (f) | |
2428 struct frame *f; | |
2429 { | |
2430 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2431 | |
2432 if (FRAME_MESSAGE_BUF (f)) | |
2433 { | |
2434 char *buffer = FRAME_MESSAGE_BUF (f); | |
2435 char *new_buffer = (char *) xrealloc (buffer, size); | |
2436 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2437 } | |
2438 else | |
2439 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2440 } | |
2441 | |
2442 | |
2443 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2444 | |
2445 static void | |
2446 adjust_decode_mode_spec_buffer (f) | |
2447 struct frame *f; | |
2448 { | |
2449 f->decode_mode_spec_buffer | |
2450 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2451 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2452 } | |
2453 | |
2454 | |
2455 | |
2456 /********************************************************************** | |
2457 Freeing Glyph Matrices | |
2458 **********************************************************************/ | |
2459 | |
2460 /* Free glyph memory for a frame F. F may be null. This function can | |
2461 be called for the same frame more than once. The root window of | |
2462 F may be nil when this function is called. This is the case when | |
2463 the function is called when F is destroyed. */ | |
2464 | |
2465 void | |
2466 free_glyphs (f) | |
2467 struct frame *f; | |
2468 { | |
2469 if (f && f->glyphs_initialized_p) | |
2470 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2471 /* 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
|
2472 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
|
2473 BLOCK_INPUT; |
25012 | 2474 f->glyphs_initialized_p = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2475 |
25012 | 2476 /* Release window sub-matrices. */ |
2477 if (!NILP (f->root_window)) | |
2478 free_window_matrices (XWINDOW (f->root_window)); | |
2479 | |
2480 /* Free the dummy window for menu bars without X toolkit and its | |
2481 glyph matrices. */ | |
2482 if (!NILP (f->menu_bar_window)) | |
2483 { | |
2484 struct window *w = XWINDOW (f->menu_bar_window); | |
2485 free_glyph_matrix (w->desired_matrix); | |
2486 free_glyph_matrix (w->current_matrix); | |
2487 w->desired_matrix = w->current_matrix = NULL; | |
2488 f->menu_bar_window = Qnil; | |
2489 } | |
2490 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2491 /* 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
|
2492 if (!NILP (f->tool_bar_window)) |
25012 | 2493 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2494 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2495 free_glyph_matrix (w->desired_matrix); |
2496 free_glyph_matrix (w->current_matrix); | |
2497 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
|
2498 f->tool_bar_window = Qnil; |
25012 | 2499 } |
2500 | |
2501 /* Release frame glyph matrices. Reset fields to zero in | |
2502 case we are called a second time. */ | |
2503 if (f->desired_matrix) | |
2504 { | |
2505 free_glyph_matrix (f->desired_matrix); | |
2506 free_glyph_matrix (f->current_matrix); | |
2507 f->desired_matrix = f->current_matrix = NULL; | |
2508 } | |
2509 | |
2510 /* Release glyph pools. */ | |
2511 if (f->desired_pool) | |
2512 { | |
2513 free_glyph_pool (f->desired_pool); | |
2514 free_glyph_pool (f->current_pool); | |
2515 f->desired_pool = f->current_pool = NULL; | |
314 | 2516 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2517 |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2518 UNBLOCK_INPUT; |
314 | 2519 } |
2520 } | |
2521 | |
25012 | 2522 |
2523 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2524 function may be called with a null pointer, and it may be called on | |
2525 the same tree more than once. */ | |
2526 | |
2527 void | |
2528 free_window_matrices (w) | |
2529 struct window *w; | |
2530 { | |
2531 while (w) | |
2532 { | |
2533 if (!NILP (w->hchild)) | |
2534 free_window_matrices (XWINDOW (w->hchild)); | |
2535 else if (!NILP (w->vchild)) | |
2536 free_window_matrices (XWINDOW (w->vchild)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2537 else |
25012 | 2538 { |
2539 /* This is a leaf window. Free its memory and reset fields | |
2540 to zero in case this function is called a second time for | |
2541 W. */ | |
2542 free_glyph_matrix (w->current_matrix); | |
2543 free_glyph_matrix (w->desired_matrix); | |
2544 w->current_matrix = w->desired_matrix = NULL; | |
2545 } | |
2546 | |
2547 /* Next window on same level. */ | |
2548 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2549 } | |
2550 } | |
2551 | |
2552 | |
2553 /* Check glyph memory leaks. This function is called from | |
2554 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2555 exits. We therefore free all glyph memory for all active frames | |
2556 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
|
2557 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2558 void |
25012 | 2559 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2560 { |
25012 | 2561 Lisp_Object tail, frame; |
2562 | |
2563 /* Free glyph memory for all frames. */ | |
2564 FOR_EACH_FRAME (tail, frame) | |
2565 free_glyphs (XFRAME (frame)); | |
2566 | |
2567 /* Check that nothing is left allocated. */ | |
2568 if (glyph_matrix_count) | |
2569 abort (); | |
2570 if (glyph_pool_count) | |
2571 abort (); | |
2572 } | |
2573 | |
2574 | |
2575 | |
2576 /********************************************************************** | |
2577 Building a Frame Matrix | |
2578 **********************************************************************/ | |
2579 | |
2580 /* Most of the redisplay code works on glyph matrices attached to | |
2581 windows. This is a good solution most of the time, but it is not | |
2582 suitable for terminal code. Terminal output functions cannot rely | |
2583 on being able to set an arbitrary terminal window. Instead they | |
2584 must be provided with a view of the whole frame, i.e. the whole | |
2585 screen. We build such a view by constructing a frame matrix from | |
2586 window matrices in this section. | |
2587 | |
2588 Windows that must be updated have their must_be_update_p flag set. | |
2589 For all such windows, their desired matrix is made part of the | |
2590 desired frame matrix. For other windows, their current matrix is | |
2591 made part of the desired frame matrix. | |
2592 | |
2593 +-----------------+----------------+ | |
2594 | desired | desired | | |
2595 | | | | |
2596 +-----------------+----------------+ | |
2597 | current | | |
2598 | | | |
2599 +----------------------------------+ | |
2600 | |
2601 Desired window matrices can be made part of the frame matrix in a | |
2602 cheap way: We exploit the fact that the desired frame matrix and | |
2603 desired window matrices share their glyph memory. This is not | |
2604 possible for current window matrices. Their glyphs are copied to | |
2605 the desired frame matrix. The latter is equivalent to | |
2606 preserve_other_columns in the old redisplay. | |
2607 | |
2608 Used glyphs counters for frame matrix rows are the result of adding | |
2609 up glyph lengths of the window matrices. A line in the frame | |
2610 matrix is enabled, if a corresponding line in a window matrix is | |
2611 enabled. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2612 |
25012 | 2613 After building the desired frame matrix, it will be passed to |
2614 terminal code, which will manipulate both the desired and current | |
2615 frame matrix. Changes applied to the frame's current matrix have | |
2616 to be visible in current window matrices afterwards, of course. | |
2617 | |
2618 This problem is solved like this: | |
2619 | |
2620 1. Window and frame matrices share glyphs. Window matrices are | |
2621 constructed in a way that their glyph contents ARE the glyph | |
2622 contents needed in a frame matrix. Thus, any modification of | |
2623 glyphs done in terminal code will be reflected in window matrices | |
2624 automatically. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2625 |
25012 | 2626 2. Exchanges of rows in a frame matrix done by terminal code are |
2627 intercepted by hook functions so that corresponding row operations | |
2628 on window matrices can be performed. This is necessary because we | |
2629 use pointers to glyphs in glyph row structures. To satisfy the | |
2630 assumption of point 1 above that glyphs are updated implicitly in | |
2631 window matrices when they are manipulated via the frame matrix, | |
2632 window and frame matrix must of course agree where to find the | |
2633 glyphs for their rows. Possible manipulations that must be | |
2634 mirrored are assignments of rows of the desired frame matrix to the | |
2635 current frame matrix and scrolling the current frame matrix. */ | |
2636 | |
2637 /* Build frame F's desired matrix from window matrices. Only windows | |
2638 which have the flag must_be_updated_p set have to be updated. Menu | |
2639 bar lines of a frame are not covered by window matrices, so make | |
2640 sure not to touch them in this function. */ | |
2641 | |
2642 static void | |
2643 build_frame_matrix (f) | |
2644 struct frame *f; | |
2645 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2646 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2647 |
25012 | 2648 /* F must have a frame matrix when this function is called. */ |
2649 xassert (!FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2650 |
25012 | 2651 /* Clear all rows in the frame matrix covered by window matrices. |
2652 Menu bar lines are not covered by windows. */ | |
2653 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2654 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2655 | |
2656 /* Build the matrix by walking the window tree. */ | |
2657 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2658 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2659 } | |
2660 | |
2661 | |
2662 /* Walk a window tree, building a frame matrix MATRIX from window | |
2663 matrices. W is the root of a window tree. */ | |
2664 | |
2665 static void | |
2666 build_frame_matrix_from_window_tree (matrix, w) | |
2667 struct glyph_matrix *matrix; | |
2668 struct window *w; | |
2669 { | |
2670 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2671 { |
25012 | 2672 if (!NILP (w->hchild)) |
2673 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2674 else if (!NILP (w->vchild)) | |
2675 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2676 else | |
2677 build_frame_matrix_from_leaf_window (matrix, w); | |
2678 | |
2679 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
|
2680 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2681 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2682 |
25012 | 2683 |
2684 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2685 desired frame matrix built. W is a leaf window whose desired or | |
2686 current matrix is to be added to FRAME_MATRIX. W's flag | |
2687 must_be_updated_p determines which matrix it contributes to | |
2688 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2689 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2690 Adding a desired matrix means setting up used counters and such in | |
2691 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2692 means copying glyphs. The latter case corresponds to | |
2693 preserve_other_columns in the old redisplay. */ | |
2694 | |
2695 static void | |
2696 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2697 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2698 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2699 { |
25012 | 2700 struct glyph_matrix *window_matrix; |
2701 int window_y, frame_y; | |
2702 /* If non-zero, a glyph to insert at the right border of W. */ | |
2703 GLYPH right_border_glyph = 0; | |
2704 | |
2705 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2706 if (w->must_be_updated_p) | |
2707 { | |
2708 window_matrix = w->desired_matrix; | |
2709 | |
2710 /* Decide whether we want to add a vertical border glyph. */ | |
2711 if (!WINDOW_RIGHTMOST_P (w)) | |
2712 { | |
2713 struct Lisp_Char_Table *dp = window_display_table (w); | |
63594
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2714 |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2715 right_border_glyph |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2716 = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp))) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2717 ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp))) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2718 : '|'); |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2719 |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2720 if (FAST_GLYPH_FACE (right_border_glyph) <= 0) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2721 right_border_glyph |
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63594
diff
changeset
|
2722 = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID); |
25012 | 2723 } |
2724 } | |
2725 else | |
2726 window_matrix = w->current_matrix; | |
2727 | |
2728 /* For all rows in the window matrix and corresponding rows in the | |
2729 frame matrix. */ | |
2730 window_y = 0; | |
2731 frame_y = window_matrix->matrix_y; | |
2732 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2733 { |
25012 | 2734 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2735 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
|
2736 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2737 |
2738 /* Fill up the frame row with spaces up to the left margin of the | |
2739 window row. */ | |
2740 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2741 | |
2742 /* Fill up areas in the window matrix row with spaces. */ | |
2743 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
|
2744 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2745 /* 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
|
2746 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
|
2747 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2748 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
|
2749 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2750 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2751 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
|
2752 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
|
2753 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2754 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2755 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
|
2756 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2757 /* Copy window row to frame row. */ |
25012 | 2758 bcopy (window_row->glyphs[0], |
2759 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2760 window_matrix->matrix_w * sizeof (struct glyph)); | |
2761 } | |
2762 else | |
2763 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2764 xassert (window_row->enabled_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2765 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2766 /* 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
|
2767 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
|
2768 frame_row->enabled_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2769 |
25012 | 2770 /* Maybe insert a vertical border between horizontally adjacent |
2771 windows. */ | |
2772 if (right_border_glyph) | |
2773 { | |
2774 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2775 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2776 } | |
2777 | |
59902
4a0a167cb6c4
(build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents:
59879
diff
changeset
|
2778 #if GLYPH_DEBUG |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2779 /* 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
|
2780 frame_y. */ |
25012 | 2781 xassert (glyph_row_slice_p (window_row, frame_row)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2782 |
25012 | 2783 /* If rows are in sync, we don't have to copy glyphs because |
2784 frame and window share glyphs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2785 |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2786 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
|
2787 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
|
2788 #endif |
25012 | 2789 } |
2790 | |
2791 /* Set number of used glyphs in the frame matrix. Since we fill | |
2792 up with spaces, and visit leaf windows from left to right it | |
2793 can be done simply. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2794 frame_row->used[TEXT_AREA] |
25012 | 2795 = window_matrix->matrix_x + window_matrix->matrix_w; |
2796 | |
2797 /* Next row. */ | |
2798 ++window_y; | |
2799 ++frame_y; | |
2800 } | |
2801 } | |
2802 | |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2803 /* 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
|
2804 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
|
2805 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
|
2806 for instance, vertical separators, truncation markers, etc. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2807 |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2808 GLYPH |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2809 spec_glyph_lookup_face (w, glyph) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2810 struct window *w; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2811 GLYPH glyph; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2812 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2813 int lface_id = FAST_GLYPH_FACE (glyph); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2814 /* 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
|
2815 if (lface_id > 0) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2816 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2817 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
|
2818 Qt, lface_id, DEFAULT_FACE_ID); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2819 glyph |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2820 = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), face_id); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2821 } |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2822 return glyph; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2823 } |
25012 | 2824 |
2825 /* Add spaces to a glyph row ROW in a window matrix. | |
2826 | |
2827 Each row has the form: | |
2828 | |
2829 +---------+-----------------------------+------------+ | |
2830 | left | text | right | | |
2831 +---------+-----------------------------+------------+ | |
2832 | |
2833 Left and right marginal areas are optional. This function adds | |
2834 spaces to areas so that there are no empty holes between areas. | |
2835 In other words: If the right area is not empty, the text area | |
2836 is filled up with spaces up to the right area. If the text area | |
2837 is not empty, the left area is filled up. | |
2838 | |
2839 To be called for frame-based redisplay, only. */ | |
2840 | |
2841 static void | |
2842 fill_up_glyph_row_with_spaces (row) | |
2843 struct glyph_row *row; | |
2844 { | |
2845 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2846 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2847 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2848 } | |
2849 | |
2850 | |
2851 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2852 frame-based redisplay only. */ | |
2853 | |
2854 static void | |
2855 fill_up_glyph_row_area_with_spaces (row, area) | |
2856 struct glyph_row *row; | |
2857 int area; | |
2858 { | |
2859 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2860 { | |
2861 struct glyph *end = row->glyphs[area + 1]; | |
2862 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2863 | |
2864 while (text < end) | |
2865 *text++ = space_glyph; | |
2866 row->used[area] = text - row->glyphs[area]; | |
2867 } | |
2868 } | |
2869 | |
2870 | |
2871 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2872 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2873 | |
2874 static void | |
2875 fill_up_frame_row_with_spaces (row, upto) | |
2876 struct glyph_row *row; | |
2877 int upto; | |
2878 { | |
2879 int i = row->used[TEXT_AREA]; | |
2880 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2881 |
25012 | 2882 while (i < upto) |
2883 glyph[i++] = space_glyph; | |
2884 | |
2885 row->used[TEXT_AREA] = i; | |
2886 } | |
2887 | |
2888 | |
2889 | |
2890 /********************************************************************** | |
2891 Mirroring operations on frame matrices in window matrices | |
2892 **********************************************************************/ | |
2893 | |
2894 /* Set frame being updated via frame-based redisplay to F. This | |
2895 function must be called before updates to make explicit that we are | |
2896 working on frame matrices or not. */ | |
2897 | |
2898 static INLINE void | |
2899 set_frame_matrix_frame (f) | |
2900 struct frame *f; | |
2901 { | |
2902 frame_matrix_frame = f; | |
2903 } | |
2904 | |
2905 | |
2906 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2907 DESIRED_MATRIX is the desired matrix corresponding to | |
2908 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2909 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2910 frame_matrix_frame is non-null, this indicates that the exchange is | |
2911 done in frame matrices, and that we have to perform analogous | |
2912 operations in window matrices of frame_matrix_frame. */ | |
2913 | |
2914 static INLINE void | |
2915 make_current (desired_matrix, current_matrix, row) | |
2916 struct glyph_matrix *desired_matrix, *current_matrix; | |
2917 int row; | |
2918 { | |
2919 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2920 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
|
2921 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2922 |
2923 /* Do current_row = desired_row. This exchanges glyph pointers | |
2924 between both rows, and does a structure assignment otherwise. */ | |
2925 assign_row (current_row, desired_row); | |
2926 | |
2927 /* Enable current_row to mark it as valid. */ | |
2928 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
|
2929 current_row->mouse_face_p = mouse_face_p; |
25012 | 2930 |
2931 /* If we are called on frame matrices, perform analogous operations | |
2932 for window matrices. */ | |
2933 if (frame_matrix_frame) | |
2934 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2935 } | |
2936 | |
2937 | |
2938 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2939 W's frame which has been made current (by swapping pointers between | |
2940 current and desired matrix). Perform analogous operations in the | |
2941 matrices of leaf windows in the window tree rooted at W. */ | |
2942 | |
2943 static void | |
2944 mirror_make_current (w, frame_row) | |
2945 struct window *w; | |
2946 int frame_row; | |
2947 { | |
2948 while (w) | |
2949 { | |
2950 if (!NILP (w->hchild)) | |
2951 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2952 else if (!NILP (w->vchild)) | |
2953 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2954 else | |
2955 { | |
2956 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2957 here because the checks performed in debug mode there | |
2958 will not allow the conversion. */ | |
2959 int row = frame_row - w->desired_matrix->matrix_y; | |
2960 | |
2961 /* If FRAME_ROW is within W, assign the desired row to the | |
2962 current row (exchanging glyph pointers). */ | |
2963 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
|
2964 { |
25012 | 2965 struct glyph_row *current_row |
2966 = MATRIX_ROW (w->current_matrix, row); | |
2967 struct glyph_row *desired_row | |
2968 = 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
|
2969 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2970 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2971 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
|
2972 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2973 swap_glyph_pointers (desired_row, current_row); |
25012 | 2974 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2975 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2976 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2977 |
25012 | 2978 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2979 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2980 } |
25012 | 2981 |
2982 | |
2983 /* Perform row dance after scrolling. We are working on the range of | |
2984 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2985 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2986 row I in the range 0 <= I < NLINES, the index of the original line | |
2987 to move to I. This index is relative to the row range, i.e. 0 <= | |
2988 index < NLINES. RETAINED_P is a vector containing zero for each | |
2989 row 0 <= I < NLINES which is empty. | |
2990 | |
2991 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
|
2992 |
25012 | 2993 void |
2994 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
2995 retained_p) | |
2996 struct glyph_matrix *matrix; | |
2997 int unchanged_at_top, nlines; | |
2998 int *copy_from; | |
2999 char *retained_p; | |
3000 { | |
3001 /* A copy of original rows. */ | |
3002 struct glyph_row *old_rows; | |
3003 | |
3004 /* Rows to assign to. */ | |
3005 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
|
3006 |
25012 | 3007 int i; |
3008 | |
3009 /* Make a copy of the original rows. */ | |
3010 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
3011 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
3012 | |
3013 /* Assign new rows, maybe clear lines. */ | |
3014 for (i = 0; i < nlines; ++i) | |
3015 { | |
3016 int enabled_before_p = new_rows[i].enabled_p; | |
3017 | |
3018 xassert (i + unchanged_at_top < matrix->nrows); | |
3019 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
3020 new_rows[i] = old_rows[copy_from[i]]; | |
3021 new_rows[i].enabled_p = enabled_before_p; | |
3022 | |
3023 /* RETAINED_P is zero for empty lines. */ | |
3024 if (!retained_p[copy_from[i]]) | |
3025 new_rows[i].enabled_p = 0; | |
3026 } | |
3027 | |
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
|
3028 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
25012 | 3029 if (frame_matrix_frame) |
3030 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
3031 unchanged_at_top, nlines, copy_from, retained_p); | |
3032 } | |
3033 | |
3034 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3035 /* 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
|
3036 the current frame matrix. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3037 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3038 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3039 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3040 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3041 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3042 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3043 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
|
3044 int left, right, x, width; |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3045 |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3046 /* 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
|
3047 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3048 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3049 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3050 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
|
3051 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
|
3052 x = w->current_matrix->matrix_x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3053 width = w->current_matrix->matrix_w; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3054 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3055 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3056 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
|
3057 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
|
3058 |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3059 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
|
3060 { |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3061 window_row->glyphs[LEFT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3062 = frame_row->glyphs[0] + x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3063 window_row->glyphs[TEXT_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3064 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3065 window_row->glyphs[LAST_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3066 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3067 window_row->glyphs[RIGHT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3068 = window_row->glyphs[LAST_AREA] - right; |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3069 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3070 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3071 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3072 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3073 /* 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
|
3074 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
|
3075 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3076 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3077 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3078 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3079 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3080 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3081 struct window *found = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3082 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3083 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3084 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3085 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3086 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
|
3087 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3088 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
|
3089 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
|
3090 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3091 found = w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3092 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3093 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3094 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3095 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3096 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3097 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3098 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3099 |
25012 | 3100 /* Perform a line dance in the window tree rooted at W, after |
3101 scrolling a frame matrix in mirrored_line_dance. | |
3102 | |
3103 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3104 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3105 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3106 I < NLINES, the index of the original line to move to I. This | |
3107 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3108 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3109 which is empty. */ | |
3110 | |
3111 static void | |
3112 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3113 struct window *w; | |
3114 int unchanged_at_top, nlines; | |
3115 int *copy_from; | |
3116 char *retained_p; | |
3117 { | |
3118 while (w) | |
3119 { | |
3120 if (!NILP (w->hchild)) | |
3121 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3122 nlines, copy_from, retained_p); | |
3123 else if (!NILP (w->vchild)) | |
3124 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3125 nlines, copy_from, retained_p); | |
3126 else | |
3127 { | |
3128 /* W is a leaf window, and we are working on its current | |
3129 matrix m. */ | |
3130 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3131 int i, sync_p = 0; |
25012 | 3132 struct glyph_row *old_rows; |
3133 | |
3134 /* Make a copy of the original rows of matrix m. */ | |
3135 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3136 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3137 | |
3138 for (i = 0; i < nlines; ++i) | |
3139 { | |
3140 /* Frame relative line assigned to. */ | |
3141 int frame_to = i + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3142 |
25012 | 3143 /* Frame relative line assigned. */ |
3144 int frame_from = copy_from[i] + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3145 |
25012 | 3146 /* Window relative line assigned to. */ |
3147 int window_to = frame_to - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3148 |
25012 | 3149 /* Window relative line assigned. */ |
3150 int window_from = frame_from - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3151 |
25012 | 3152 /* Is assigned line inside window? */ |
3153 int from_inside_window_p | |
3154 = window_from >= 0 && window_from < m->matrix_h; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3155 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3156 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3157 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3158 = window_to >= 0 && window_to < m->matrix_h; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3159 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3160 if (from_inside_window_p && to_inside_window_p) |
25012 | 3161 { |
3162 /* Enabled setting before assignment. */ | |
3163 int enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3164 |
25012 | 3165 /* Do the assignment. The enabled_p flag is saved |
3166 over the assignment because the old redisplay did | |
3167 that. */ | |
3168 enabled_before_p = m->rows[window_to].enabled_p; | |
3169 m->rows[window_to] = old_rows[window_from]; | |
3170 m->rows[window_to].enabled_p = enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3171 |
25012 | 3172 /* If frame line is empty, window line is empty, too. */ |
3173 if (!retained_p[copy_from[i]]) | |
3174 m->rows[window_to].enabled_p = 0; | |
3175 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3176 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3177 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3178 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3179 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3180 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3181 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3182 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3183 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3184 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3185 |
60684
18bf961ed63a
(mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents:
59905
diff
changeset
|
3186 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
|
3187 /* 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
|
3188 -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
|
3189 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
|
3190 if (w2) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3191 { |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3192 m2 = w2->current_matrix; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3193 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
|
3194 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
|
3195 m2->rows + m2_from); |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3196 |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3197 /* 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
|
3198 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
|
3199 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
|
3200 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3201 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3202 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3203 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3204 sync_p = 1; |
25012 | 3205 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3206 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3207 /* 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
|
3208 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3209 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3210 sync_window_with_frame_matrix_rows (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3211 |
25012 | 3212 /* Check that no pointers are lost. */ |
3213 CHECK_MATRIX (m); | |
3214 } | |
3215 | |
3216 /* Next window on same level. */ | |
3217 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3218 } | |
3219 } | |
3220 | |
3221 | |
3222 #if GLYPH_DEBUG | |
3223 | |
3224 /* Check that window and frame matrices agree about their | |
3225 understanding where glyphs of the rows are to find. For each | |
3226 window in the window tree rooted at W, check that rows in the | |
3227 matrices of leaf window agree with their frame matrices about | |
3228 glyph pointers. */ | |
314 | 3229 |
21514 | 3230 void |
25012 | 3231 check_window_matrix_pointers (w) |
314 | 3232 struct window *w; |
3233 { | |
25012 | 3234 while (w) |
3235 { | |
3236 if (!NILP (w->hchild)) | |
3237 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3238 else if (!NILP (w->vchild)) | |
3239 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3240 else | |
3241 { | |
3242 struct frame *f = XFRAME (w->frame); | |
3243 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3244 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3245 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3246 |
25012 | 3247 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
3248 } | |
3249 } | |
3250 | |
3251 | |
3252 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3253 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3254 each row in WINDOW_MATRIX check that it's a slice of the | |
3255 corresponding frame row. If it isn't, abort. */ | |
3256 | |
3257 static void | |
3258 check_matrix_pointers (window_matrix, frame_matrix) | |
3259 struct glyph_matrix *window_matrix, *frame_matrix; | |
3260 { | |
3261 /* Row number in WINDOW_MATRIX. */ | |
3262 int i = 0; | |
3263 | |
3264 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3265 int j = window_matrix->matrix_y; | |
3266 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3267 /* For all rows check that the row in the window matrix is a |
25012 | 3268 slice of the row in the frame matrix. If it isn't we didn't |
3269 mirror an operation on the frame matrix correctly. */ | |
3270 while (i < window_matrix->nrows) | |
3271 { | |
3272 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3273 frame_matrix->rows + j)) | |
3274 abort (); | |
3275 ++i, ++j; | |
3276 } | |
3277 } | |
3278 | |
3279 #endif /* GLYPH_DEBUG != 0 */ | |
3280 | |
3281 | |
3282 | |
3283 /********************************************************************** | |
3284 VPOS and HPOS translations | |
3285 **********************************************************************/ | |
3286 | |
3287 #if GLYPH_DEBUG | |
3288 | |
3289 /* Translate vertical position VPOS which is relative to window W to a | |
3290 vertical position relative to W's frame. */ | |
3291 | |
3292 static int | |
3293 window_to_frame_vpos (w, vpos) | |
3294 struct window *w; | |
3295 int vpos; | |
3296 { | |
3297 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3298 |
25012 | 3299 xassert (!FRAME_WINDOW_P (f)); |
3300 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
|
3301 vpos += WINDOW_TOP_EDGE_LINE (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3302 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
25012 | 3303 return vpos; |
3304 } | |
3305 | |
3306 | |
3307 /* 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
|
3308 a horizontal position relative to W's frame. */ |
25012 | 3309 |
3310 static int | |
3311 window_to_frame_hpos (w, hpos) | |
3312 struct window *w; | |
3313 int hpos; | |
3314 { | |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
3315 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
|
3316 hpos += WINDOW_LEFT_EDGE_COL (w); |
25012 | 3317 return hpos; |
314 | 3318 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3319 |
25012 | 3320 #endif /* GLYPH_DEBUG */ |
3321 | |
3322 | |
314 | 3323 |
25012 | 3324 /********************************************************************** |
3325 Redrawing Frames | |
3326 **********************************************************************/ | |
3327 | |
3328 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
|
3329 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
|
3330 (frame) |
25012 | 3331 Lisp_Object frame; |
3332 { | |
3333 struct frame *f; | |
3334 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3335 CHECK_LIVE_FRAME (frame); |
25012 | 3336 f = XFRAME (frame); |
3337 | |
3338 /* Ignore redraw requests, if frame has no glyphs yet. | |
3339 (Implementation note: It still has to be checked why we are | |
3340 called so early here). */ | |
3341 if (!glyphs_initialized_initially_p) | |
3342 return Qnil; | |
3343 | |
3344 update_begin (f); | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3345 #ifdef MSDOS |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3346 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
|
3347 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
|
3348 #endif |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3349 clear_frame (f); |
25012 | 3350 clear_current_matrices (f); |
3351 update_end (f); | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3352 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3353 fflush (FRAME_TTY (f)->output); |
25012 | 3354 windows_or_buffers_changed++; |
3355 /* Mark all windows as inaccurate, so that every window will have | |
3356 its redisplay done. */ | |
3357 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3358 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3359 f->garbaged = 0; | |
3360 return Qnil; | |
3361 } | |
3362 | |
3363 | |
3364 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3365 function redraw-frame. */ | |
3366 | |
3367 void | |
3368 redraw_frame (f) | |
3369 struct frame *f; | |
3370 { | |
3371 Lisp_Object frame; | |
3372 XSETFRAME (frame, f); | |
3373 Fredraw_frame (frame); | |
3374 } | |
3375 | |
3376 | |
3377 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
|
3378 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
|
3379 () |
25012 | 3380 { |
3381 Lisp_Object tail, frame; | |
3382 | |
3383 FOR_EACH_FRAME (tail, frame) | |
3384 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3385 Fredraw_frame (frame); | |
3386 | |
3387 return Qnil; | |
3388 } | |
3389 | |
3390 | |
3391 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3392 visible frames marked as garbaged. */ | |
3393 | |
3394 void | |
3395 redraw_garbaged_frames () | |
3396 { | |
3397 Lisp_Object tail, frame; | |
3398 | |
3399 FOR_EACH_FRAME (tail, frame) | |
3400 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3401 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3402 Fredraw_frame (frame); | |
3403 } | |
3404 | |
3405 | |
3406 | |
3407 /*********************************************************************** | |
3408 Direct Operations | |
3409 ***********************************************************************/ | |
3410 | |
3411 /* Try to update display and current glyph matrix directly. | |
3412 | |
3413 This function is called after a character G has been inserted into | |
3414 current_buffer. It tries to update the current glyph matrix and | |
3415 perform appropriate screen output to reflect the insertion. If it | |
3416 succeeds, the global flag redisplay_performed_directly_p will be | |
3417 set to 1, and thereby prevent the more costly general redisplay | |
3418 from running (see redisplay_internal). | |
3419 | |
3420 This function is not called for `hairy' character insertions. | |
3421 In particular, it is not called when after or before change | |
3422 functions exist, like they are used by font-lock. See keyboard.c | |
3423 for details where this function is called. */ | |
314 | 3424 |
3425 int | |
3426 direct_output_for_insert (g) | |
3427 int g; | |
3428 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3429 register struct frame *f = SELECTED_FRAME (); |
25012 | 3430 struct window *w = XWINDOW (selected_window); |
3431 struct it it, it2; | |
3432 struct glyph_row *glyph_row; | |
3433 struct glyph *glyphs, *glyph, *end; | |
3434 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
|
3435 /* Non-null means that redisplay of W is based on window matrices. */ |
25012 | 3436 int window_redisplay_p = FRAME_WINDOW_P (f); |
3437 /* Non-null means we are in overwrite mode. */ | |
3438 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3439 int added_width; | |
3440 struct text_pos pos; | |
3441 int delta, delta_bytes; | |
3442 | |
3443 /* Not done directly. */ | |
3444 redisplay_performed_directly_p = 0; | |
3445 | |
3446 /* Quickly give up for some common cases. */ | |
3447 if (cursor_in_echo_area | |
3448 /* Give up if fonts have changed. */ | |
3449 || fonts_changed_p | |
3450 /* Give up if face attributes have been changed. */ | |
3451 || face_change_count | |
3452 /* Give up if cursor position not really known. */ | |
314 | 3453 || !display_completed |
25012 | 3454 /* Give up if buffer appears in two places. */ |
314 | 3455 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3456 /* 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
|
3457 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3458 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3459 && EQ (minibuf_window, echo_area_window)) |
25012 | 3460 /* Give up for hscrolled mini-buffer because display of the prompt |
3461 is handled specially there (see display_line). */ | |
3462 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3463 /* Give up if overwriting in the middle of a line. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3464 || (overwrite_p |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3465 && PT != ZV |
25012 | 3466 && FETCH_BYTE (PT) != '\n') |
3467 /* Give up for tabs and line ends. */ | |
3468 || g == '\t' | |
3469 || g == '\n' | |
3470 || g == '\r' | |
3471 /* Give up if unable to display the cursor in the window. */ | |
3472 || 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
|
3473 /* 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
|
3474 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
|
3475 || !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
|
3476 || !NILP (echo_area_buffer[1]) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3477 || (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
|
3478 /* 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
|
3479 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3480 (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
|
3481 || 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
|
3482 /* 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
|
3483 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
|
3484 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3485 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3486 || glyph_row->overlapped_p)) |
25012 | 3487 /* Can't do it for partial width windows on terminal frames |
3488 because we can't clear to eol in such a window. */ | |
3489 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3490 return 0; | |
3491 | |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3492 /* 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
|
3493 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
|
3494 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
|
3495 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
|
3496 return 0; |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3497 |
25012 | 3498 /* Set up a display iterator structure for W. Glyphs will be |
3499 produced in scratch_glyph_row. Current position is W's cursor | |
3500 position. */ | |
3501 clear_glyph_row (&scratch_glyph_row); | |
3502 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
|
3503 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3504 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3505 DEFAULT_FACE_ID); | |
3506 | |
3507 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
|
3508 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
|
3509 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3510 |
25012 | 3511 /* Give up if highlighting trailing whitespace and we have trailing |
3512 whitespace in glyph_row. We would have to remove the trailing | |
3513 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3514 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3515 && glyph_row->used[TEXT_AREA]) |
3516 { | |
3517 struct glyph *last; | |
3518 | |
3519 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3520 if (last->type == STRETCH_GLYPH | |
3521 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3522 && last->u.ch == ' ')) |
25012 | 3523 return 0; |
3524 } | |
3525 | |
3526 /* Give up if there are overlay strings at pos. This would fail | |
3527 if the overlay string has newlines in it. */ | |
3528 if (STRINGP (it.string)) | |
3529 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3530 |
25012 | 3531 it.hpos = w->cursor.hpos; |
3532 it.vpos = w->cursor.vpos; | |
3533 it.current_x = w->cursor.x + it.first_visible_x; | |
3534 it.current_y = w->cursor.y; | |
3535 it.end_charpos = PT; | |
3536 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
|
3537 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
25012 | 3538 |
3539 /* More than one display element may be returned for PT - 1 if | |
3540 (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
|
3541 `^C', or (ii) it has a display table entry, or (iii) it's a |
25012 | 3542 combination of both. */ |
3543 delta = delta_bytes = 0; | |
3544 while (get_next_display_element (&it)) | |
3545 { | |
3546 PRODUCE_GLYPHS (&it); | |
3547 | |
3548 /* Give up if glyph doesn't fit completely on the line. */ | |
3549 if (it.current_x >= it.last_visible_x) | |
3550 return 0; | |
3551 | |
3552 /* Give up if new glyph has different ascent or descent than | |
3553 the original row, or if it is not a character glyph. */ | |
3554 if (glyph_row->ascent != it.ascent | |
3555 || 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
|
3556 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3557 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3558 || it.what != IT_CHARACTER) |
3559 return 0; | |
3560 | |
3561 delta += 1; | |
3562 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3563 set_iterator_to_next (&it, 1); |
25012 | 3564 } |
3565 | |
3566 /* Give up if we hit the right edge of the window. We would have | |
3567 to insert truncation or continuation glyphs. */ | |
3568 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3569 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3570 return 0; |
3571 | |
25012 | 3572 /* Give up if there is a \t following in the line. */ |
3573 it2 = it; | |
3574 it2.end_charpos = ZV; | |
3575 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3576 while (get_next_display_element (&it2) | |
3577 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3578 { | |
3579 if (it2.c == '\t') | |
3580 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3581 set_iterator_to_next (&it2, 1); |
25012 | 3582 } |
3583 | |
3584 /* Number of new glyphs produced. */ | |
3585 n = it.glyph_row->used[TEXT_AREA]; | |
3586 | |
3587 /* Start and end of glyphs in original row. */ | |
3588 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3589 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3590 | |
3591 /* Make room for new glyphs, then insert them. */ | |
3592 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3593 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3594 (end - glyphs - n) * sizeof (*end)); |
25012 | 3595 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3596 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3597 end - glyph_row->glyphs[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3598 |
25012 | 3599 /* Compute new line width. */ |
3600 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3601 end = glyph + glyph_row->used[TEXT_AREA]; | |
3602 glyph_row->pixel_width = glyph_row->x; | |
3603 while (glyph < end) | |
3604 { | |
3605 glyph_row->pixel_width += glyph->pixel_width; | |
3606 ++glyph; | |
3607 } | |
3608 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3609 /* Increment buffer positions for glyphs following the newly |
25012 | 3610 inserted ones. */ |
3611 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
|
3612 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3613 glyph->charpos += delta; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3614 |
25012 | 3615 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
3616 { | |
3617 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3618 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3619 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3620 |
25012 | 3621 /* 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
|
3622 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3623 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3624 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3625 delta, delta_bytes); |
25012 | 3626 |
3627 glyph_row->contains_overlapping_glyphs_p | |
3628 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3629 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3630 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3631 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
|
3632 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3633 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3634 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3635 highlight_trailing_whitespace (it.f, glyph_row); |
3636 | |
3637 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3638 In the middle, we have to insert glyphs. Note that this is now | |
3639 implemented for X frames. The implementation uses updated_window | |
3640 and updated_row. */ | |
3641 updated_row = glyph_row; | |
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3642 updated_area = TEXT_AREA; |
25012 | 3643 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
|
3644 if (FRAME_RIF (f)) |
25012 | 3645 { |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3646 FRAME_RIF (f)->update_window_begin_hook (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3647 |
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3648 if (glyphs == end - n |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3649 /* 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
|
3650 || (glyphs == end - n - 1 |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3651 && (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
|
3652 FRAME_RIF (f)->write_glyphs (glyphs, n); |
25012 | 3653 else |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3654 FRAME_RIF (f)->insert_glyphs (glyphs, n); |
25012 | 3655 } |
3656 else | |
3657 { | |
3658 if (glyphs == end - n) | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3659 write_glyphs (f, glyphs, n); |
25012 | 3660 else |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3661 insert_glyphs (f, glyphs, n); |
25012 | 3662 } |
3663 | |
3664 w->cursor.hpos += n; | |
3665 w->cursor.x = it.current_x - it.first_visible_x; | |
3666 xassert (w->cursor.hpos >= 0 | |
3667 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3668 | |
3669 /* How to set the cursor differs depending on whether we are | |
3670 using a frame matrix or a window matrix. Note that when | |
3671 a frame matrix is used, cursor_to expects frame coordinates, | |
3672 and the X and Y parameters are not used. */ | |
3673 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
|
3674 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
|
3675 w->cursor.y, w->cursor.x); |
25012 | 3676 else |
3677 { | |
3678 int x, y; | |
3679 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
|
3680 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3681 ? XFASTINT (w->left_margin_cols) |
25012 | 3682 : 0)); |
3683 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3684 cursor_to (f, y, x); |
25012 | 3685 } |
3686 | |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3687 #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
|
3688 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
|
3689 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3690 |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3691 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
|
3692 FRAME_RIF (f)->update_window_end_hook (w, 1, 0); |
25012 | 3693 update_end (f); |
3694 updated_row = NULL; | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3695 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3696 fflush (FRAME_TTY (f)->output); |
25012 | 3697 |
3698 TRACE ((stderr, "direct output for insert\n")); | |
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3699 mark_window_display_accurate (it.window, 1); |
25012 | 3700 redisplay_performed_directly_p = 1; |
314 | 3701 return 1; |
3702 } | |
3703 | |
25012 | 3704 |
3705 /* Perform a direct display update for moving PT by N positions | |
3706 left or right. N < 0 means a movement backwards. This function | |
3707 is currently only called for N == 1 or N == -1. */ | |
3708 | |
314 | 3709 int |
3710 direct_output_forward_char (n) | |
3711 int n; | |
3712 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3713 struct frame *f = SELECTED_FRAME (); |
25012 | 3714 struct window *w = XWINDOW (selected_window); |
3715 struct glyph_row *row; | |
3716 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3717 /* 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
|
3718 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
|
3719 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3720 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3721 |
25012 | 3722 /* Give up if face attributes have been changed. */ |
3723 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3724 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3725 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3726 /* Give up if current matrix is not up to date or we are |
25012 | 3727 displaying a message. */ |
3728 if (!display_completed || cursor_in_echo_area) | |
3729 return 0; | |
3730 | |
3731 /* Give up if the buffer's direction is reversed. */ | |
3732 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3733 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
|
3734 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3735 /* 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
|
3736 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
|
3737 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3738 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3739 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3740 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3741 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3742 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3743 /* 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
|
3744 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
|
3745 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
|
3746 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3747 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3748 /* 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
|
3749 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3750 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3751 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3752 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3753 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3754 /* 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
|
3755 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3756 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3757 |
25012 | 3758 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3759 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3760 /* 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
|
3761 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3762 || 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
|
3763 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3764 |
25012 | 3765 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
|
3766 |
25012 | 3767 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3768 XSETFASTINT (w->last_point, PT); |
25012 | 3769 |
3770 xassert (w->cursor.hpos >= 0 | |
3771 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3772 |
25012 | 3773 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
|
3774 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
|
3775 w->cursor.y, w->cursor.x); |
25012 | 3776 else |
3777 { | |
3778 int x, y; | |
3779 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
|
3780 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3781 ? XFASTINT (w->left_margin_cols) |
25012 | 3782 : 0)); |
3783 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3784 cursor_to (f, y, x); |
25012 | 3785 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3786 |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3787 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3788 fflush (FRAME_TTY (f)->output); |
25012 | 3789 redisplay_performed_directly_p = 1; |
314 | 3790 return 1; |
3791 } | |
25012 | 3792 |
3793 | |
314 | 3794 |
25012 | 3795 /*********************************************************************** |
3796 Frame Update | |
3797 ***********************************************************************/ | |
3798 | |
3799 /* Update frame F based on the data in desired matrices. | |
3800 | |
3801 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3802 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3803 scrolling. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3804 |
25012 | 3805 Value is non-zero if redisplay was stopped due to pending input. */ |
314 | 3806 |
3807 int | |
25012 | 3808 update_frame (f, force_p, inhibit_hairy_id_p) |
3809 struct frame *f; | |
3810 int force_p; | |
3811 int inhibit_hairy_id_p; | |
3812 { | |
3813 /* 1 means display has been paused because of pending input. */ | |
3814 int paused_p; | |
3815 struct window *root_window = XWINDOW (f->root_window); | |
3816 | |
3817 if (FRAME_WINDOW_P (f)) | |
3818 { | |
3819 /* We are working on window matrix basis. All windows whose | |
3820 flag must_be_updated_p is set have to be updated. */ | |
3821 | |
3822 /* Record that we are not working on frame matrices. */ | |
3823 set_frame_matrix_frame (NULL); | |
3824 | |
3825 /* Update all windows in the window tree of F, maybe stopping | |
3826 when pending input is detected. */ | |
3827 update_begin (f); | |
3828 | |
3829 /* Update the menu bar on X frames that don't have toolkit | |
3830 support. */ | |
3831 if (WINDOWP (f->menu_bar_window)) | |
3832 update_window (XWINDOW (f->menu_bar_window), 1); | |
3833 | |
3834 /* 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
|
3835 if (WINDOWP (f->tool_bar_window)) |
25012 | 3836 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3837 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3838 |
3839 /* Update tool-bar window. */ | |
3840 if (w->must_be_updated_p) | |
3841 { | |
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
|
3842 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
|
3843 |
25012 | 3844 update_window (w, 1); |
3845 w->must_be_updated_p = 0; | |
3846 | |
3847 /* Swap tool-bar strings. We swap because we want to | |
3848 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3849 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
|
3850 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
|
3851 f->desired_tool_bar_string = tem; |
25012 | 3852 } |
3853 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3854 |
25012 | 3855 |
3856 /* Update windows. */ | |
3857 paused_p = update_window_tree (root_window, force_p); | |
3858 update_end (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3859 |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3860 /* This flush is a performance bottleneck under X, |
83037 | 3861 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
|
3862 It is necessary when resizing the window with the mouse, or |
83037 | 3863 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
|
3864 if (f->force_flush_display_p) |
83037 | 3865 { |
3866 FRAME_RIF (f)->flush_display (f); | |
3867 f->force_flush_display_p = 0; | |
3868 } | |
25012 | 3869 } |
3870 else | |
3871 { | |
3872 /* We are working on frame matrix basis. Set the frame on whose | |
3873 frame matrix we operate. */ | |
3874 set_frame_matrix_frame (f); | |
3875 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3876 /* Build F's desired matrix from window matrices. */ |
25012 | 3877 build_frame_matrix (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3878 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3879 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3880 update_begin (f); |
25012 | 3881 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
|
3882 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3883 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3884 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
|
3885 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3886 if (FRAME_TTY (f)->termscript) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3887 fflush (FRAME_TTY (f)->termscript); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3888 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
|
3889 } |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3890 |
25012 | 3891 /* 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
|
3892 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3893 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3894 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3895 #endif |
25012 | 3896 } |
3897 | |
3898 /* Reset flags indicating that a window should be updated. */ | |
3899 set_window_update_flags (root_window, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3900 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3901 display_completed = !paused_p; |
25012 | 3902 return paused_p; |
3903 } | |
3904 | |
3905 | |
3906 | |
3907 /************************************************************************ | |
3908 Window-based updates | |
3909 ************************************************************************/ | |
3910 | |
3911 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3912 don't stop updating when input is pending. */ | |
3913 | |
3914 static int | |
3915 update_window_tree (w, force_p) | |
3916 struct window *w; | |
3917 int force_p; | |
3918 { | |
3919 int paused_p = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3920 |
25012 | 3921 while (w && !paused_p) |
3922 { | |
3923 if (!NILP (w->hchild)) | |
3924 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3925 else if (!NILP (w->vchild)) | |
3926 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3927 else if (w->must_be_updated_p) | |
3928 paused_p |= update_window (w, force_p); | |
3929 | |
3930 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3931 } | |
3932 | |
3933 return paused_p; | |
3934 } | |
3935 | |
3936 | |
3937 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3938 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3939 | |
3940 void | |
3941 update_single_window (w, force_p) | |
3942 struct window *w; | |
3943 int force_p; | |
3944 { | |
3945 if (w->must_be_updated_p) | |
3946 { | |
3947 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3948 | |
3949 /* Record that this is not a frame-based redisplay. */ | |
3950 set_frame_matrix_frame (NULL); | |
3951 | |
3952 /* Update W. */ | |
3953 update_begin (f); | |
3954 update_window (w, force_p); | |
3955 update_end (f); | |
3956 | |
3957 /* Reset flag in W. */ | |
3958 w->must_be_updated_p = 0; | |
3959 } | |
3960 } | |
3961 | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3962 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 3963 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3964 /* 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
|
3965 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
|
3966 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3967 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3968 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3969 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3970 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3971 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3972 int i; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3973 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3974 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3975 /* 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
|
3976 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
|
3977 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
|
3978 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
|
3979 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3980 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
|
3981 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3982 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
|
3983 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3984 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3985 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3986 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3987 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3988 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3989 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3990 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3991 enum glyph_row_area area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3992 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3993 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
|
3994 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3995 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3996 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
|
3997 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
|
3998 area == TEXT_AREA ? row->x : 0); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3999 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
|
4000 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
|
4001 row->used[area]); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4002 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
|
4003 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4004 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4005 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4006 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4007 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4008 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
|
4009 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4010 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4011 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4012 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4013 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4014 /* 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
|
4015 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
|
4016 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4017 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4018 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4019 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4020 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4021 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4022 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4023 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
|
4024 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4025 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4026 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4027 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4028 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4029 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4030 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4031 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4032 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4033 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4034 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4035 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4036 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4037 if (row->overlapping_p && i > 0 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4038 { |
65890
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4039 int overlaps = 0; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4040 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4041 if (MATRIX_ROW_OVERLAPS_PRED_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4042 && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4043 overlaps |= OVERLAPS_PRED; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4044 if (MATRIX_ROW_OVERLAPS_SUCC_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4045 && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4046 overlaps |= OVERLAPS_SUCC; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4047 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4048 if (overlaps) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4049 { |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4050 if (row->used[LEFT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4051 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4052 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4053 if (row->used[TEXT_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4054 rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4055 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4056 if (row->used[RIGHT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4057 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4058 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4059 /* Record in neighbour rows that ROW overwrites part of |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4060 their display. */ |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4061 if (overlaps & OVERLAPS_PRED) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4062 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4063 if (overlaps & OVERLAPS_SUCC) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4064 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4065 } |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4066 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4067 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4068 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4069 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4070 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4071 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4072 |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4073 #endif /* HAVE_WINDOW_SYSTEM */ |
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4074 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4075 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4076 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4077 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4078 /* Check that no row in the current matrix of window W is enabled |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4079 which is below what's displayed in the window. */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4080 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4081 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4082 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4083 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4084 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4085 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4086 int i, yb = window_text_bottom_y (w); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4087 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4088 for (i = 0; i < w->current_matrix->nrows - 1; ++i) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4089 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4090 struct glyph_row *row = MATRIX_ROW (w->current_matrix, i); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4091 if (!last_seen_p && MATRIX_ROW_BOTTOM_Y (row) >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4092 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4093 else if (last_seen_p && row->enabled_p) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4094 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4095 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4096 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4097 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4098 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4099 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4100 |
25012 | 4101 /* Update display of window W. FORCE_P non-zero means that we should |
4102 not stop when detecting pending input. */ | |
4103 | |
4104 static int | |
4105 update_window (w, force_p) | |
4106 struct window *w; | |
4107 int force_p; | |
4108 { | |
4109 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4110 int paused_p; | |
4111 int preempt_count = baud_rate / 2400 + 1; | |
4112 extern int input_pending; | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4113 extern Lisp_Object do_mouse_tracking; |
83241
3dcba0bc766b
Merged in changes from CVS trunk. (Long time no see!) :-)
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
4114 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
|
4115 #if GLYPH_DEBUG |
25012 | 4116 /* 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
|
4117 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
|
4118 #endif |
25012 | 4119 |
4120 /* Check pending input the first time so that we can quickly return. */ | |
4121 if (redisplay_dont_pause) | |
4122 force_p = 1; | |
4123 else | |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4124 detect_input_pending_ignore_squeezables (); |
25012 | 4125 |
4126 /* If forced to complete the update, or if no input is pending, do | |
4127 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4128 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 4129 { |
4130 struct glyph_row *row, *end; | |
4131 struct glyph_row *mode_line_row; | |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4132 struct glyph_row *header_line_row; |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4133 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4134 |
4135 rif->update_window_begin_hook (w); | |
4136 yb = window_text_bottom_y (w); | |
4137 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4138 /* If window has a header line, update it before everything else. |
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4139 Adjust y-positions of other rows by the header line height. */ |
25012 | 4140 row = desired_matrix->rows; |
4141 end = row + desired_matrix->nrows - 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4142 |
25012 | 4143 if (row->mode_line_p) |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4144 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4145 header_line_row = row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4146 ++row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4147 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4148 else |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4149 header_line_row = NULL; |
25012 | 4150 |
4151 /* Update the mode line, if necessary. */ | |
4152 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4153 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4154 { | |
4155 mode_line_row->y = yb; | |
4156 update_window_line (w, MATRIX_ROW_VPOS (mode_line_row, | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4157 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4158 &mouse_face_overwritten_p); |
25012 | 4159 } |
4160 | |
4161 /* Find first enabled row. Optimizations in redisplay_internal | |
4162 may lead to an update with only one row enabled. There may | |
4163 be also completely empty matrices. */ | |
4164 while (row < end && !row->enabled_p) | |
4165 ++row; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4166 |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4167 /* Try reusing part of the display by copying. */ |
25012 | 4168 if (row < end && !desired_matrix->no_scrolling_p) |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4169 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4170 int rc = scrolling_window (w, header_line_row != NULL); |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4171 if (rc < 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4172 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4173 /* All rows were found to be equal. */ |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4174 paused_p = 0; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4175 goto set_cursor; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4176 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4177 else if (rc > 0) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4178 { |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4179 /* We've scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4180 force_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4181 changed_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4182 } |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4183 } |
25012 | 4184 |
4185 /* Update the rest of the lines. */ | |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4186 for (n_updated = 0; row < end && (force_p || !input_pending); ++row) |
31653
2554afbeb88d
(update_window): Make sure to make desired rows
Gerd Moellmann <gerd@gnu.org>
parents:
31295
diff
changeset
|
4187 if (row->enabled_p) |
25012 | 4188 { |
4189 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4190 int i; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4191 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4192 /* We'll have to play a little bit with when to |
25012 | 4193 detect_input_pending. If it's done too often, |
4194 scrolling large windows with repeated scroll-up | |
4195 commands will too quickly pause redisplay. */ | |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4196 if (!force_p && ++n_updated % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4197 detect_input_pending_ignore_squeezables (); |
25012 | 4198 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4199 changed_p |= update_window_line (w, vpos, |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4200 &mouse_face_overwritten_p); |
25012 | 4201 |
4202 /* Mark all rows below the last visible one in the current | |
4203 matrix as invalid. This is necessary because of | |
4204 variable line heights. Consider the case of three | |
4205 successive redisplays, where the first displays 5 | |
4206 lines, the second 3 lines, and the third 5 lines again. | |
4207 If the second redisplay wouldn't mark rows in the | |
4208 current matrix invalid, the third redisplay might be | |
4209 tempted to optimize redisplay based on lines displayed | |
4210 in the first redisplay. */ | |
4211 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4212 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4213 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4214 } | |
4215 | |
4216 /* Was display preempted? */ | |
4217 paused_p = row < end; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4218 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4219 set_cursor: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4220 |
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4221 /* Update the header line after scrolling because a new header |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4222 line would otherwise overwrite lines at the top of the window |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4223 that can be scrolled. */ |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4224 if (header_line_row && header_line_row->enabled_p) |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4225 { |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4226 header_line_row->y = 0; |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4227 update_window_line (w, 0, &mouse_face_overwritten_p); |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4228 } |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4229 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4230 /* Fix the appearance of overlapping/overlapped rows. */ |
25012 | 4231 if (!paused_p && !w->pseudo_window_p) |
4232 { | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4233 #ifdef HAVE_WINDOW_SYSTEM |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4234 if (changed_p && rif->fix_overlapping_area) |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4235 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4236 redraw_overlapped_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4237 redraw_overlapping_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4238 } |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4239 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4240 |
25012 | 4241 /* Make cursor visible at cursor position of W. */ |
4242 set_window_cursor_after_update (w); | |
4243 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4244 #if 0 /* Check that current matrix invariants are satisfied. This is |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4245 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4246 IF_DEBUG (check_matrix_invariants (w)); |
4247 #endif | |
4248 } | |
4249 | |
4250 #if GLYPH_DEBUG | |
4251 /* Remember the redisplay method used to display the matrix. */ | |
4252 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4253 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4254 |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4255 #ifdef HAVE_WINDOW_SYSTEM |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4256 update_window_fringes (w, 0); |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4257 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4258 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4259 /* End the update of window W. Don't set the cursor if we |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4260 paused updating the display because in this case, |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4261 set_window_cursor_after_update hasn't been called, and |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4262 output_cursor doesn't contain the cursor location. */ |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4263 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
25012 | 4264 } |
4265 else | |
4266 paused_p = 1; | |
4267 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4268 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4269 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4270 add_window_display_history (w, w->current_matrix->method, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4271 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4272 |
25012 | 4273 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4274 |
25012 | 4275 return paused_p; |
4276 } | |
4277 | |
4278 | |
4279 /* Update the display of area AREA in window W, row number VPOS. | |
4280 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4281 | |
4282 static void | |
4283 update_marginal_area (w, area, vpos) | |
4284 struct window *w; | |
4285 int area, vpos; | |
4286 { | |
4287 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4288 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4289 |
4290 /* Let functions in xterm.c know what area subsequent X positions | |
4291 will be relative to. */ | |
4292 updated_area = area; | |
4293 | |
4294 /* Set cursor to start of glyphs, write them, and clear to the end | |
4295 of the area. I don't think that something more sophisticated is | |
4296 necessary here, since marginal areas will not be the default. */ | |
4297 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4298 if (desired_row->used[area]) | |
4299 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4300 rif->clear_end_of_line (-1); | |
4301 } | |
4302 | |
4303 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4304 /* 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
|
4305 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
|
4306 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4307 static int |
25012 | 4308 update_text_area (w, vpos) |
4309 struct window *w; | |
4310 int vpos; | |
314 | 4311 { |
25012 | 4312 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4313 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
|
4314 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
|
4315 int changed_p = 0; |
25012 | 4316 |
4317 /* Let functions in xterm.c know what area subsequent X positions | |
4318 will be relative to. */ | |
4319 updated_area = TEXT_AREA; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4320 |
25012 | 4321 /* If rows are at different X or Y, or rows have different height, |
4322 or the current row is marked invalid, write the entire line. */ | |
4323 if (!current_row->enabled_p | |
4324 || desired_row->y != current_row->y | |
4325 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4326 || 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
|
4327 || desired_row->phys_height != current_row->phys_height |
25012 | 4328 || 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
|
4329 || current_row->overlapped_p |
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4330 || current_row->mouse_face_p |
25012 | 4331 || current_row->x != desired_row->x) |
4332 { | |
4333 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
|
4334 |
25012 | 4335 if (desired_row->used[TEXT_AREA]) |
4336 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4337 desired_row->used[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4338 |
25012 | 4339 /* Clear to end of window. */ |
4340 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4341 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
|
4342 |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4343 /* 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
|
4344 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
|
4345 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
|
4346 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
|
4347 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
|
4348 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
|
4349 redisplay. */ |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4350 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
|
4351 w->phys_cursor_on_p = 0; |
25012 | 4352 } |
4353 else | |
4354 { | |
4355 int stop, i, x; | |
4356 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4357 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
|
4358 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
|
4359 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
|
4360 |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4361 /* 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
|
4362 unless the current row also does so at the same position, |
25012 | 4363 make sure we write at least one glyph, so that the face |
4364 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
|
4365 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
|
4366 && (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
|
4367 || (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
|
4368 && !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
|
4369 --desired_stop_pos; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4370 |
25012 | 4371 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
4372 i = 0; | |
4373 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4374 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4375 /* 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
|
4376 in common. */ |
25012 | 4377 while (i < stop) |
4378 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4379 int can_skip_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4380 |
25012 | 4381 /* 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
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 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
|
4387 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
|
4388 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4389 if (overlapping_glyphs_p && i > 0) |
25012 | 4390 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4391 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
|
4392 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4393 |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4394 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
|
4395 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4396 can_skip_p = right == 0; |
25012 | 4397 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4398 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4399 if (can_skip_p) |
25012 | 4400 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4401 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4402 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4403 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4404 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4405 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4406 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4407 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4408 /* 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
|
4409 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
|
4410 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
|
4411 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
|
4412 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
|
4413 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
|
4414 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
|
4415 taken care of by draw_glyphs. */ |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4416 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4417 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4418 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4419 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4420 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4421 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4422 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4423 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4424 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
|
4425 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4426 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4427 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4428 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4429 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4430 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4431 } |
25012 | 4432 } |
4433 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4434 |
25012 | 4435 /* Try to avoid writing the entire rest of the desired row |
4436 by looking for a resync point. This mainly prevents | |
4437 mode line flickering in the case the mode line is in | |
4438 fixed-pitch font, which it usually will be. */ | |
4439 if (i < desired_row->used[TEXT_AREA]) | |
4440 { | |
4441 int start_x = x, start_hpos = i; | |
4442 struct glyph *start = desired_glyph; | |
4443 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4444 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4445 |
25012 | 4446 /* Find the next glyph that's equal again. */ |
4447 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4448 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4449 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4450 && x == current_x) |
4451 { | |
4452 x += desired_glyph->pixel_width; | |
4453 current_x += current_glyph->pixel_width; | |
4454 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4455 skip_first_p = 0; |
25012 | 4456 } |
4457 | |
4458 if (i == start_hpos || x != current_x) | |
4459 { | |
4460 i = start_hpos; | |
4461 x = start_x; | |
4462 desired_glyph = start; | |
4463 break; | |
4464 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4465 |
25012 | 4466 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4467 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
|
4468 changed_p = 1; |
25012 | 4469 } |
4470 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4471 |
25012 | 4472 /* Write the rest. */ |
4473 if (i < desired_row->used[TEXT_AREA]) | |
4474 { | |
4475 rif->cursor_to (vpos, i, desired_row->y, x); | |
4476 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
|
4477 changed_p = 1; |
25012 | 4478 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4479 |
25012 | 4480 /* Maybe clear to end of line. */ |
4481 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4482 { | |
4483 /* If new row extends to the end of the text area, nothing | |
4484 has to be cleared, if and only if we did a write_glyphs | |
4485 above. This is made sure by setting desired_stop_pos | |
4486 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
|
4487 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
|
4488 || ((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
|
4489 == 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
|
4490 && MATRIX_ROW_EXTENDS_FACE_P (current_row))); |
25012 | 4491 } |
4492 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4493 { | |
4494 /* If old row extends to the end of the text area, clear. */ | |
4495 if (i >= desired_row->used[TEXT_AREA]) | |
4496 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
|
4497 desired_row->pixel_width); |
25012 | 4498 rif->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4499 changed_p = 1; |
25012 | 4500 } |
4501 else if (desired_row->pixel_width < current_row->pixel_width) | |
4502 { | |
4503 /* Otherwise clear to the end of the old row. Everything | |
4504 after that position should be clear already. */ | |
4505 int x; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4506 |
25012 | 4507 if (i >= desired_row->used[TEXT_AREA]) |
4508 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
|
4509 desired_row->pixel_width); |
25012 | 4510 |
4511 /* If cursor is displayed at the end of the line, make sure | |
4512 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4513 with which to erase the cursor (because this method | |
4514 doesn't work with lbearing/rbearing), so we must do it | |
4515 this way. */ | |
4516 if (vpos == w->phys_cursor.vpos | |
4517 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4518 { | |
4519 w->phys_cursor_on_p = 0; | |
4520 x = -1; | |
4521 } | |
4522 else | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4523 x = current_row->pixel_width; |
25012 | 4524 rif->clear_end_of_line (x); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4525 changed_p = 1; |
25012 | 4526 } |
4527 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4528 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4529 return changed_p; |
25012 | 4530 } |
4531 | |
4532 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4533 /* 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
|
4534 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4535 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4536 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4537 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4538 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4539 int vpos, *mouse_face_overwritten_p; |
25012 | 4540 { |
4541 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4542 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
|
4543 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
|
4544 int changed_p = 0; |
25012 | 4545 |
4546 /* Set the row being updated. This is important to let xterm.c | |
4547 know what line height values are in effect. */ | |
4548 updated_row = desired_row; | |
4549 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4550 /* 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
|
4551 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
|
4552 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
|
4553 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
|
4554 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4555 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4556 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4557 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4558 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4559 /* 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
|
4560 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
|
4561 && !NILP (w->left_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4562 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4563 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4564 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
|
4565 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4566 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4567 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4568 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4569 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4570 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4571 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4572 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4573 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4574 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4575 /* 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
|
4576 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
|
4577 && !NILP (w->right_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4578 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4579 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4580 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
|
4581 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4582 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4583 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4584 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4585 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4586 || 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
|
4587 || 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
|
4588 || 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
|
4589 || current_row->redraw_fringe_bitmaps_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4590 || 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
|
4591 || 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
|
4592 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4593 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4594 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
|
4595 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4596 |
25012 | 4597 /* Update current_row from desired_row. */ |
4598 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4599 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4600 return changed_p; |
25012 | 4601 } |
4602 | |
4603 | |
4604 /* Set the cursor after an update of window W. This function may only | |
4605 be called from update_window. */ | |
4606 | |
4607 static void | |
4608 set_window_cursor_after_update (w) | |
4609 struct window *w; | |
4610 { | |
4611 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
|
4612 struct redisplay_interface *rif = FRAME_RIF (f); |
25012 | 4613 int cx, cy, vpos, hpos; |
4614 | |
4615 /* Not intended for frame matrix updates. */ | |
4616 xassert (FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4617 |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4618 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4619 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4620 /* 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
|
4621 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4622 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4623 && EQ (minibuf_window, echo_area_window) |
25012 | 4624 /* These cases apply only to the frame that contains |
4625 the active mini-buffer window. */ | |
4626 && FRAME_HAS_MINIBUF_P (f) | |
4627 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4628 { | |
4629 cx = cy = vpos = hpos = 0; | |
4630 | |
4631 if (cursor_in_echo_area >= 0) | |
4632 { | |
4633 /* If the mini-buffer is several lines high, find the last | |
4634 line that has any text on it. Note: either all lines | |
4635 are enabled or none. Otherwise we wouldn't be able to | |
4636 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4637 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4638 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4639 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4640 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4641 last_row = NULL; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4642 row = w->current_matrix->rows; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4643 while (row->enabled_p |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4644 && (last_row == NULL |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4645 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
25012 | 4646 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4647 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4648 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4649 last_row = row; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4650 ++row; |
25012 | 4651 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4652 |
25012 | 4653 if (last_row) |
4654 { | |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4655 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
|
4656 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
|
4657 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4658 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4659 --last; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4660 |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4661 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4662 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4663 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4664 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4665 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4666 |
25012 | 4667 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4668 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4669 } |
4670 } | |
4671 } | |
4672 else | |
4673 { | |
4674 cx = w->cursor.x; | |
4675 cy = w->cursor.y; | |
4676 hpos = w->cursor.hpos; | |
4677 vpos = w->cursor.vpos; | |
4678 } | |
4679 | |
4680 /* Window cursor can be out of sync for horizontally split windows. */ | |
4681 hpos = max (0, hpos); | |
4682 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4683 vpos = max (0, vpos); | |
4684 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4685 rif->cursor_to (vpos, hpos, cy, cx); | |
4686 } | |
4687 | |
4688 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4689 /* 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
|
4690 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4691 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4692 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4693 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4694 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4695 int on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4696 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4697 while (w) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4698 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4699 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4700 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4701 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4702 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4703 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4704 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4705 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4706 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4707 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4708 } |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4709 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4710 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4711 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4712 /*********************************************************************** |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4713 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4714 ***********************************************************************/ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4715 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4716 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4717 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4718 struct row_entry |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4719 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4720 /* 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
|
4721 int old_uses, new_uses; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4722 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4723 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4724 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4725 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4726 /* 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
|
4727 int bucket; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4728 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4729 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4730 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4731 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4732 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4733 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4734 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4735 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4736 /* 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
|
4737 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
|
4738 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4739 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4740 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4741 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4742 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4743 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4744 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4745 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4746 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4747 /* 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
|
4748 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
|
4749 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4750 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4751 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4752 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4753 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4754 /* 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
|
4755 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
|
4756 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4757 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4758 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4759 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4760 /* 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
|
4761 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4762 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4763 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4764 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4765 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4766 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4767 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4768 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4769 /* 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
|
4770 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4771 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4772 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4773 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4774 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4775 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4776 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4777 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4778 int i = row->hash % row_table_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4779 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4780 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4781 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
|
4782 entry = entry->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4783 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4784 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4785 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4786 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4787 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4788 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4789 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4790 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4791 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4792 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4793 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4794 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4795 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4796 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4797 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4798 |
25012 | 4799 /* 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
|
4800 HEADER_LINE_P non-zero means W has a header line. |
25012 | 4801 |
4802 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4803 Technique for Isolating Differences Between Files." It should take | |
4804 O(N) time. | |
4805 | |
4806 A short outline of the steps of the algorithm | |
4807 | |
4808 1. Skip lines equal at the start and end of both matrices. | |
4809 | |
4810 2. Enter rows in the current and desired matrix into a symbol | |
4811 table, counting how often they appear in both matrices. | |
4812 | |
4813 3. Rows that appear exactly once in both matrices serve as anchors, | |
4814 i.e. we assume that such lines are likely to have been moved. | |
4815 | |
4816 4. Starting from anchor lines, extend regions to be scrolled both | |
4817 forward and backward. | |
4818 | |
4819 Value is | |
4820 | |
4821 -1 if all rows were found to be equal. | |
4822 0 to indicate that we did not scroll the display, or | |
4823 1 if we did scroll. */ | |
4824 | |
4825 static int | |
25546 | 4826 scrolling_window (w, header_line_p) |
25012 | 4827 struct window *w; |
25546 | 4828 int header_line_p; |
25012 | 4829 { |
4830 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4831 struct glyph_matrix *current_matrix = w->current_matrix; | |
4832 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4833 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
|
4834 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4835 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
|
4836 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4837 |
4838 /* 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
|
4839 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4840 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4841 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
|
4842 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
|
4843 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4844 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4845 && d->enabled_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4846 && !d->redraw_fringe_bitmaps_p |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4847 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4848 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4849 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4850 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4851 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4852 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4853 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4854 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4855 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4856 break; |
25012 | 4857 } |
4858 | |
4859 /* Give up if some rows in the desired matrix are not enabled. */ | |
4860 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4861 return -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4862 |
25012 | 4863 first_old = first_new = i; |
4864 | |
4865 /* Set last_new to the index + 1 of the last enabled row in the | |
4866 desired matrix. */ | |
4867 i = first_new + 1; | |
4868 while (i < desired_matrix->nrows - 1 | |
4869 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4871 ++i; |
4872 | |
4873 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4874 return 0; | |
4875 | |
4876 last_new = i; | |
4877 | |
4878 /* Set last_old to the index + 1 of the last enabled row in the | |
4879 current matrix. We don't look at the enabled flag here because | |
4880 we plan to reuse part of the display even if other parts are | |
4881 disabled. */ | |
4882 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4883 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4884 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4885 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
|
4886 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4887 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4888 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4889 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4890 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4891 |
25012 | 4892 last_old = i; |
4893 | |
4894 /* Skip over rows equal at the bottom. */ | |
4895 i = last_new; | |
4896 j = last_old; | |
4897 while (i - 1 > first_new | |
4898 && j - 1 > first_old | |
4899 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4900 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4901 == 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
|
4902 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
25012 | 4903 && row_equal_p (w, |
4904 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
|
4905 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4906 --i, --j; |
4907 last_new = i; | |
4908 last_old = j; | |
4909 | |
4910 /* Nothing to do if all rows are equal. */ | |
4911 if (last_new == first_new) | |
4912 return 0; | |
4913 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 /* Reallocate vectors, tables etc. if necessary. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4915 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4916 if (current_matrix->nrows > old_lines_size) |
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 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4919 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4920 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4921 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4922 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4923 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4924 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4925 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4926 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4927 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4928 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4929 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4930 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4931 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4932 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4933 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4934 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4935 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4936 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4937 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4938 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4939 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4940 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4941 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4942 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4943 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
|
4944 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4945 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4946 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4947 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4948 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4949 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4950 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4951 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4952 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4953 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4954 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4955 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4956 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4957 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4958 /* 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
|
4959 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
|
4960 |
25012 | 4961 for (i = first_old; i < last_old; ++i) |
4962 { | |
4963 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4964 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4965 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
|
4966 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4967 ++entry->old_uses; |
25012 | 4968 } |
4969 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4970 old_lines[i] = NULL; |
25012 | 4971 } |
4972 | |
4973 for (i = first_new; i < last_new; ++i) | |
4974 { | |
4975 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4976 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
|
4977 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4978 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4979 new_lines[i] = entry; |
25012 | 4980 } |
4981 | |
4982 /* Identify moves based on lines that are unique and equal | |
4983 in both matrices. */ | |
4984 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4985 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4986 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4987 && old_lines[i]->new_uses == 1) |
25012 | 4988 { |
4989 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4990 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4991 struct run *run = run_pool + run_idx++; |
25012 | 4992 |
4993 /* Record move. */ | |
4994 run->current_vpos = i; | |
4995 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4996 run->desired_vpos = new_line; | |
4997 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4998 run->nrows = 1; | |
4999 run->height = MATRIX_ROW (current_matrix, i)->height; | |
5000 | |
5001 /* Extend backward. */ | |
5002 j = i - 1; | |
5003 k = new_line - 1; | |
5004 while (j > first_old | |
5005 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5006 && old_lines[j] == new_lines[k]) |
25012 | 5007 { |
5008 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5009 --run->current_vpos; |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5010 --run->desired_vpos; |
25012 | 5011 ++run->nrows; |
5012 run->height += h; | |
5013 run->desired_y -= h; | |
5014 run->current_y -= h; | |
5015 --j, --k; | |
5016 } | |
5017 | |
5018 /* Extend forward. */ | |
5019 j = i + 1; | |
5020 k = new_line + 1; | |
5021 while (j < last_old | |
5022 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5023 && old_lines[j] == new_lines[k]) |
25012 | 5024 { |
5025 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5026 ++run->nrows; |
25012 | 5027 run->height += h; |
5028 ++j, ++k; | |
5029 } | |
5030 | |
5031 /* Insert run into list of all runs. Order runs by copied | |
5032 pixel lines. Note that we record runs that don't have to | |
5033 be copied because they are already in place. This is done | |
5034 because we can avoid calling update_window_line in this | |
5035 case. */ | |
5036 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
5037 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
5038 for (k = nruns; k > j; --k) |
25012 | 5039 runs[k] = runs[k - 1]; |
5040 runs[j] = run; | |
5041 ++nruns; | |
5042 | |
5043 i += run->nrows; | |
5044 } | |
5045 else | |
5046 ++i; | |
5047 | |
5048 /* Do the moves. Do it in a way that we don't overwrite something | |
5049 we want to copy later on. This is not solvable in general | |
5050 because there is only one display and we don't have a way to | |
5051 exchange areas on this display. Example: | |
5052 | |
5053 +-----------+ +-----------+ | |
5054 | A | | B | | |
5055 +-----------+ --> +-----------+ | |
5056 | B | | A | | |
5057 +-----------+ +-----------+ | |
5058 | |
5059 Instead, prefer bigger moves, and invalidate moves that would | |
5060 copy from where we copied to. */ | |
5061 | |
5062 for (i = 0; i < nruns; ++i) | |
5063 if (runs[i]->nrows > 0) | |
5064 { | |
5065 struct run *r = runs[i]; | |
5066 | |
5067 /* Copy on the display. */ | |
5068 if (r->current_y != r->desired_y) | |
5069 { | |
5070 rif->scroll_run_hook (w, r); | |
5071 | |
5072 /* Invalidate runs that copy from where we copied to. */ | |
5073 for (j = i + 1; j < nruns; ++j) | |
5074 { | |
5075 struct run *p = runs[j]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5076 |
25012 | 5077 if ((p->current_y >= r->desired_y |
5078 && p->current_y < r->desired_y + r->height) | |
5079 || (p->current_y + p->height >= r->desired_y | |
5080 && (p->current_y + p->height | |
5081 < r->desired_y + r->height))) | |
5082 p->nrows = 0; | |
5083 } | |
5084 } | |
5085 | |
5086 /* Assign matrix rows. */ | |
5087 for (j = 0; j < r->nrows; ++j) | |
5088 { | |
5089 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5090 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
|
5091 |
25012 | 5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 && (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
|
5097 || 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
|
5098 || 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
|
5099 || 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
|
5100 || 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
|
5101 from->redraw_fringe_bitmaps_p = 1; |
25012 | 5102 assign_row (to, from); |
5103 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
|
5104 to->overlapped_p = to_overlapped_p; |
25012 | 5105 } |
5106 } | |
5107 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5108 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5109 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5110 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5111 |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5112 /* 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
|
5113 return nruns; |
25012 | 5114 } |
5115 | |
5116 | |
5117 | |
5118 /************************************************************************ | |
5119 Frame-Based Updates | |
5120 ************************************************************************/ | |
5121 | |
5122 /* Update the desired frame matrix of frame F. | |
5123 | |
5124 FORCE_P non-zero means that the update should not be stopped by | |
5125 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
5126 should not be tried. | |
5127 | |
5128 Value is non-zero if update was stopped due to pending input. */ | |
5129 | |
5130 static int | |
5131 update_frame_1 (f, force_p, inhibit_id_p) | |
5132 struct frame *f; | |
5133 int force_p; | |
5134 int inhibit_id_p; | |
5135 { | |
5136 /* Frame matrices to work on. */ | |
5137 struct glyph_matrix *current_matrix = f->current_matrix; | |
5138 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
5139 int i; | |
314 | 5140 int pause; |
5141 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 5142 extern int input_pending; |
25012 | 5143 |
5144 xassert (current_matrix && desired_matrix); | |
314 | 5145 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5146 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
|
5147 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5148 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5149 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5150 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5151 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5152 if (redisplay_dont_pause) |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5153 force_p = 1; |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
5154 else if (!force_p && detect_input_pending_ignore_squeezables ()) |
314 | 5155 { |
5156 pause = 1; | |
5157 goto do_pause; | |
5158 } | |
5159 | |
25012 | 5160 /* 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
|
5161 if (!FRAME_LINE_INS_DEL_OK (f)) |
25012 | 5162 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5163 |
493 | 5164 /* See if any of the desired lines are enabled; don't compute for |
25012 | 5165 i/d line if just want cursor motion. */ |
5166 for (i = 0; i < desired_matrix->nrows; i++) | |
5167 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5168 break; |
5169 | |
5170 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5171 if (!inhibit_id_p && i < desired_matrix->nrows) |
5172 force_p |= scrolling (f); | |
314 | 5173 |
5174 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5175 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5176 update_frame_line (f, desired_matrix->nrows - 1); | |
5177 | |
5178 /* Now update the rest of the lines. */ | |
5179 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5180 { |
25012 | 5181 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5182 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5183 if (FRAME_TERMCAP_P (f)) |
314 | 5184 { |
5185 /* Flush out every so many lines. | |
5186 Also flush out if likely to have more than 1k buffered | |
5187 otherwise. I'm told that some telnet connections get | |
5188 really screwed by more than 1k output at once. */ | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5189 int outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f)->output); |
314 | 5190 if (outq > 900 |
5191 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
5192 { | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5193 fflush (FRAME_TTY (f)->output); |
314 | 5194 if (preempt_count == 1) |
5195 { | |
554 | 5196 #ifdef EMACS_OUTQSIZE |
5197 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 5198 /* Probably not a tty. Ignore the error and reset |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
5199 the outq count. */ |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5200 outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output)); |
314 | 5201 #endif |
5202 outq *= 10; | |
7530
57c2345a9002
(update_frame): Fix test of outq and baud_rate some more.
Richard M. Stallman <rms@gnu.org>
parents:
7529
diff
changeset
|
5203 if (baud_rate <= outq && baud_rate > 0) |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5204 sleep (outq / baud_rate); |
314 | 5205 } |
5206 } | |
5207 } | |
5208 | |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5209 if ((i - 1) % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
5210 detect_input_pending_ignore_squeezables (); |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5211 |
25012 | 5212 update_frame_line (f, i); |
314 | 5213 } |
5214 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5215 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5216 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
314 | 5217 |
5218 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5219 if (!pause) | |
5220 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5221 if ((cursor_in_echo_area |
25012 | 5222 /* 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
|
5223 show the cursor for the message instead of for the |
25012 | 5224 (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
|
5225 || (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
|
5226 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5227 && !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
|
5228 /* These cases apply only to the frame that contains |
25012 | 5229 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
|
5230 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5231 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5232 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5233 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
|
5234 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5235 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5236 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5237 { |
25012 | 5238 /* Negative value of cursor_in_echo_area means put |
5239 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5240 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5241 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5242 } |
708 | 5243 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5244 { |
25012 | 5245 /* Positive value of cursor_in_echo_area means put |
5246 cursor at the end of the prompt. If the mini-buffer | |
5247 is several lines high, find the last line that has | |
5248 any text on it. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5249 row = FRAME_LINES (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5250 do |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5251 { |
25012 | 5252 --row; |
5253 col = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5254 |
25012 | 5255 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
5256 { | |
5257 /* Frame rows are filled up with spaces that | |
5258 must be ignored here. */ | |
5259 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5260 row); | |
5261 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5262 struct glyph *last = start + r->used[TEXT_AREA]; | |
5263 | |
5264 while (last > start | |
5265 && (last - 1)->charpos < 0) | |
5266 --last; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5267 |
25012 | 5268 col = last - start; |
5269 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5270 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5271 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5272 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5273 /* 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
|
5274 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
|
5275 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5276 /* 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
|
5277 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
|
5278 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5279 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
|
5280 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5281 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5282 /* 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
|
5283 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5284 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
|
5285 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5286 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5287 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5288 cursor_to (f, row, col); |
708 | 5289 } |
314 | 5290 else |
25012 | 5291 { |
5292 /* We have only one cursor on terminal frames. Use it to | |
5293 display the cursor of the selected window. */ | |
5294 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
|
5295 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5296 /* 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
|
5297 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
|
5298 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
|
5299 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
|
5300 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
|
5301 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
25012 | 5302 { |
5303 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5304 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5305 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5306 if (INTEGERP (w->left_margin_cols)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5307 x += XFASTINT (w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5308 |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5309 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5310 cursor_to (f, y, x); |
25012 | 5311 } |
5312 } | |
314 | 5313 } |
5314 | |
5315 do_pause: | |
5316 | |
25012 | 5317 clear_desired_matrices (f); |
314 | 5318 return pause; |
5319 } | |
5320 | |
25012 | 5321 |
5322 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5323 |
21514 | 5324 int |
764 | 5325 scrolling (frame) |
25012 | 5326 struct frame *frame; |
314 | 5327 { |
5328 int unchanged_at_top, unchanged_at_bottom; | |
5329 int window_size; | |
5330 int changed_lines; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5331 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
|
5332 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
|
5333 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
|
5334 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
314 | 5335 register int i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5336 int free_at_end_vpos = FRAME_LINES (frame); |
25012 | 5337 struct glyph_matrix *current_matrix = frame->current_matrix; |
5338 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5339 | |
5340 if (!current_matrix) | |
5341 abort (); | |
5342 | |
5343 /* Compute hash codes of all the lines. Also calculate number of | |
5344 changed lines, number of unchanged lines at the beginning, and | |
5345 number of unchanged lines at the end. */ | |
314 | 5346 changed_lines = 0; |
5347 unchanged_at_top = 0; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5348 unchanged_at_bottom = FRAME_LINES (frame); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5349 for (i = 0; i < FRAME_LINES (frame); i++) |
314 | 5350 { |
5351 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5352 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5353 return 0; |
25012 | 5354 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5355 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
|
5356 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5357 /* 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
|
5358 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5359 #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
|
5360 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5361 } |
314 | 5362 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5363 { |
25012 | 5364 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5365 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
|
5366 } |
314 | 5367 |
5368 if (old_hash[i] != new_hash[i]) | |
5369 { | |
5370 changed_lines++; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5371 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
314 | 5372 } |
5373 else if (i == unchanged_at_top) | |
5374 unchanged_at_top++; | |
25012 | 5375 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5376 } |
5377 | |
5378 /* 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
|
5379 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
|
5380 && changed_lines < baud_rate / 2400) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5381 || unchanged_at_bottom == FRAME_LINES (frame)) |
314 | 5382 return 1; |
5383 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5384 window_size = (FRAME_LINES (frame) - unchanged_at_top |
314 | 5385 - unchanged_at_bottom); |
5386 | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5387 if (FRAME_SCROLL_REGION_OK (frame)) |
314 | 5388 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
|
5389 else if (FRAME_MEMORY_BELOW_FRAME (frame)) |
314 | 5390 free_at_end_vpos = -1; |
5391 | |
5392 /* If large window, fast terminal and few lines in common between | |
25012 | 5393 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
|
5394 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
|
5395 && window_size >= 18 && baud_rate > 2400 |
314 | 5396 && (window_size >= |
5397 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
|
5398 FRAME_LINES (frame) - unchanged_at_bottom, |
314 | 5399 old_hash, new_hash, draw_cost))) |
5400 return 0; | |
5401 | |
25012 | 5402 if (window_size < 2) |
5403 return 0; | |
5404 | |
764 | 5405 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5406 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
|
5407 old_draw_cost + unchanged_at_top - 1, |
314 | 5408 old_hash + unchanged_at_top - 1, |
5409 new_hash + unchanged_at_top - 1, | |
5410 free_at_end_vpos - unchanged_at_top); | |
5411 | |
5412 return 0; | |
5413 } | |
25012 | 5414 |
5415 | |
5416 /* Count the number of blanks at the start of the vector of glyphs R | |
5417 which is LEN glyphs long. */ | |
5418 | |
5419 static int | |
5420 count_blanks (r, len) | |
5421 struct glyph *r; | |
5422 int len; | |
314 | 5423 { |
25012 | 5424 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5425 |
25012 | 5426 for (i = 0; i < len; ++i) |
5427 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5428 break; | |
5429 | |
5430 return i; | |
314 | 5431 } |
25012 | 5432 |
5433 | |
5434 /* Count the number of glyphs in common at the start of the glyph | |
5435 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5436 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5437 |
5438 static int | |
25012 | 5439 count_match (str1, end1, str2, end2) |
5440 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5441 { |
25012 | 5442 struct glyph *p1 = str1; |
5443 struct glyph *p2 = str2; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5444 |
25012 | 5445 while (p1 < end1 |
5446 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5447 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5448 ++p1, ++p2; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5449 |
25012 | 5450 return p1 - str1; |
314 | 5451 } |
5452 | |
25012 | 5453 |
314 | 5454 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5455 |
314 | 5456 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
|
5457 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
314 | 5458 |
25012 | 5459 |
5460 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5461 | |
314 | 5462 static void |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5463 update_frame_line (f, vpos) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5464 struct frame *f; |
314 | 5465 int vpos; |
5466 { | |
25012 | 5467 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5468 int tem; |
5469 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
|
5470 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
|
5471 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5472 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5473 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5474 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
|
5475 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
|
5476 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
|
5477 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5478 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5479 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5480 write_spaces_p = 1; |
25012 | 5481 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5482 /* 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
|
5483 write the whole desired line in that case. */ |
25012 | 5484 must_write_whole_line_p = !current_row->enabled_p; |
5485 if (must_write_whole_line_p) | |
314 | 5486 { |
25012 | 5487 obody = 0; |
314 | 5488 olen = 0; |
5489 } | |
5490 else | |
5491 { | |
25012 | 5492 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5493 olen = current_row->used[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5494 |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5495 /* 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
|
5496 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5497 while (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
|
5498 olen--; |
314 | 5499 } |
5500 | |
25012 | 5501 current_row->enabled_p = 1; |
5502 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5503 | |
5504 /* If desired line is empty, just clear the line. */ | |
5505 if (!desired_row->enabled_p) | |
314 | 5506 { |
5507 nlen = 0; | |
5508 goto just_erase; | |
5509 } | |
5510 | |
25012 | 5511 nbody = desired_row->glyphs[TEXT_AREA]; |
5512 nlen = desired_row->used[TEXT_AREA]; | |
5513 nend = nbody + nlen; | |
5514 | |
5515 /* If display line has unknown contents, write the whole line. */ | |
5516 if (must_write_whole_line_p) | |
5517 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5518 /* 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
|
5519 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5520 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
|
5521 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5522 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5523 /* 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
|
5524 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5525 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5526 cursor_to (f, vpos, 0); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5527 write_glyphs (f, nbody, nlen); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5528 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5529 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5530 /* 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
|
5531 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
|
5532 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
|
5533 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
|
5534 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5535 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5536 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
|
5537 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5538 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5539 /* 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
|
5540 with cmgoto might use `ch' in the wrong row. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5541 cursor_to (f, vpos, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5542 |
25012 | 5543 make_current (desired_matrix, current_matrix, vpos); |
5544 return; | |
5545 } | |
314 | 5546 |
5547 /* Pretend trailing spaces are not there at all, | |
5548 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
|
5549 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5550 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
|
5551 nlen--; |
314 | 5552 |
5553 /* 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
|
5554 if (!FRAME_CHAR_INS_DEL_OK (f)) |
314 | 5555 { |
25012 | 5556 int i, j; |
5557 | |
5558 /* Find the first glyph in desired row that doesn't agree with | |
5559 a glyph in the current row, and write the rest from there on. */ | |
314 | 5560 for (i = 0; i < nlen; i++) |
5561 { | |
25012 | 5562 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5563 { |
25012 | 5564 /* Find the end of the run of different glyphs. */ |
5565 j = i + 1; | |
5566 while (j < nlen | |
5567 && (j >= olen | |
5568 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5569 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5570 ++j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5571 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5572 /* Output this run of non-matching chars. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5573 cursor_to (f, vpos, i); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5574 write_glyphs (f, nbody + i, j - i); |
25012 | 5575 i = j - 1; |
314 | 5576 |
5577 /* Now find the next non-match. */ | |
5578 } | |
5579 } | |
5580 | |
5581 /* Clear the rest of the line, or the non-clear part of it. */ | |
5582 if (olen > nlen) | |
5583 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5584 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5585 clear_end_of_line (f, olen); |
314 | 5586 } |
5587 | |
25012 | 5588 /* Make current row = desired row. */ |
5589 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5590 return; |
5591 } | |
5592 | |
25012 | 5593 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5594 characters in a row. */ | |
5595 | |
314 | 5596 if (!olen) |
5597 { | |
25012 | 5598 /* If current line is blank, skip over initial spaces, if |
5599 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
|
5600 if (write_spaces_p) |
25012 | 5601 nsp = 0; |
5602 else | |
5603 nsp = count_blanks (nbody, nlen); | |
5604 | |
314 | 5605 if (nlen > nsp) |
5606 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5607 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5608 write_glyphs (f, nbody + nsp, nlen - nsp); |
314 | 5609 } |
5610 | |
764 | 5611 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5612 make_current (desired_matrix, current_matrix, vpos); |
314 | 5613 return; |
5614 } | |
5615 | |
5616 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5617 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
|
5618 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
25012 | 5619 |
5620 /* Compute number of matching chars starting with first non-blank. */ | |
5621 begmatch = count_match (obody + osp, obody + olen, | |
5622 nbody + nsp, nbody + nlen); | |
314 | 5623 |
5624 /* Spaces in new match implicit space past the end of old. */ | |
5625 /* 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
|
5626 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5627 { |
5628 np1 = nbody + nsp; | |
25012 | 5629 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5630 ++begmatch; | |
314 | 5631 } |
5632 | |
5633 /* Avoid doing insert/delete char | |
5634 just cause number of leading spaces differs | |
25012 | 5635 when the following text does not match. */ |
314 | 5636 if (begmatch == 0 && osp != nsp) |
5637 osp = nsp = min (osp, nsp); | |
5638 | |
5639 /* Find matching characters at end of line */ | |
5640 op1 = obody + olen; | |
5641 np1 = nbody + nlen; | |
5642 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5643 while (op1 > op2 |
5644 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5645 { |
5646 op1--; | |
5647 np1--; | |
5648 } | |
5649 endmatch = obody + olen - op1; | |
5650 | |
5651 /* tem gets the distance to insert or delete. | |
5652 endmatch is how many characters we save by doing so. | |
5653 Is it worth it? */ | |
5654 | |
5655 tem = (nlen - nsp) - (olen - osp); | |
5656 if (endmatch && tem | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5657 && (!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
|
5658 || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5659 endmatch = 0; |
5660 | |
5661 /* nsp - osp is the distance to insert or delete. | |
5662 If that is nonzero, begmatch is known to be nonzero also. | |
5663 begmatch + endmatch is how much we save by doing the ins/del. | |
5664 Is it worth it? */ | |
5665 | |
5666 if (nsp != osp | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5667 && (!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
|
5668 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5669 { |
5670 begmatch = 0; | |
5671 endmatch = 0; | |
5672 osp = nsp = min (osp, nsp); | |
5673 } | |
5674 | |
5675 /* Now go through the line, inserting, writing and | |
5676 deleting as appropriate. */ | |
5677 | |
5678 if (osp > nsp) | |
5679 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5680 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5681 delete_glyphs (f, osp - nsp); |
314 | 5682 } |
5683 else if (nsp > osp) | |
5684 { | |
5685 /* If going to delete chars later in line | |
5686 and insert earlier in the line, | |
5687 must delete first to avoid losing data in the insert */ | |
5688 if (endmatch && nlen < olen + nsp - osp) | |
5689 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5690 cursor_to (f, vpos, nlen - endmatch + osp - nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5691 delete_glyphs (f, olen + nsp - osp - nlen); |
314 | 5692 olen = nlen - (nsp - osp); |
5693 } | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5694 cursor_to (f, vpos, osp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5695 insert_glyphs (f, 0, nsp - osp); |
314 | 5696 } |
5697 olen += nsp - osp; | |
5698 | |
5699 tem = nsp + begmatch + endmatch; | |
5700 if (nlen != tem || olen != tem) | |
5701 { | |
5702 if (!endmatch || nlen == olen) | |
5703 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5704 /* 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
|
5705 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
|
5706 (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
|
5707 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
|
5708 if (nlen == FRAME_TOTAL_COLS (f)) |
314 | 5709 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5710 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5711 /* 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
|
5712 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
|
5713 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5714 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5715 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5716 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5717 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
|
5718 } |
314 | 5719 } |
5720 else if (nlen > olen) | |
5721 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5722 /* 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
|
5723 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5724 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
|
5725 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
|
5726 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5727 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
|
5728 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5729 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
|
5730 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5731 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5732 cursor_to (f, vpos, nsp + begmatch); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5733 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5734 /* 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
|
5735 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
|
5736 out--; |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5737 write_glyphs (f, nbody + nsp + begmatch, out); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5738 |
25012 | 5739 /* 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
|
5740 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5741 if (del > 0) |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5742 delete_glyphs (f, del); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5743 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5744 /* At last, we insert columns not yet written out. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5745 insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5746 olen = nlen; |
5747 } | |
5748 else if (olen > nlen) | |
5749 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5750 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5751 write_glyphs (f, nbody + nsp + begmatch, nlen - tem); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5752 delete_glyphs (f, olen - nlen); |
314 | 5753 olen = nlen; |
5754 } | |
5755 } | |
5756 | |
5757 just_erase: | |
5758 /* If any unerased characters remain after the new line, erase them. */ | |
5759 if (olen > nlen) | |
5760 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5761 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5762 clear_end_of_line (f, olen); |
314 | 5763 } |
5764 | |
764 | 5765 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5766 make_current (desired_matrix, current_matrix, vpos); |
314 | 5767 } |
25012 | 5768 |
5769 | |
314 | 5770 |
25012 | 5771 /*********************************************************************** |
5772 X/Y Position -> Buffer Position | |
5773 ***********************************************************************/ | |
5774 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5775 /* 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
|
5776 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
|
5777 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
|
5778 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
|
5779 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5780 Lisp_Object |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5781 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
25012 | 5782 struct window *w; |
5783 int *x, *y; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5784 struct display_pos *pos; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5785 Lisp_Object *object; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5786 int *dx, *dy; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5787 int *width, *height; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5788 { |
25012 | 5789 struct it it; |
5790 struct buffer *old_current_buffer = current_buffer; | |
5791 struct text_pos startp; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5792 Lisp_Object string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5793 struct glyph_row *row; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5794 #ifdef HAVE_WINDOW_SYSTEM |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5795 struct image *img = 0; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5796 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5797 int x0, x1; |
25012 | 5798 |
5799 current_buffer = XBUFFER (w->buffer); | |
5800 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5801 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5802 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5803 start_display (&it, w, startp); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5804 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5805 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
|
5806 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
25012 | 5807 MOVE_TO_X | MOVE_TO_Y); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5808 |
25012 | 5809 current_buffer = old_current_buffer; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5810 |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5811 *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
|
5812 *dy = *y - it.current_y; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5813 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5814 string = w->buffer; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5815 if (STRINGP (it.string)) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5816 string = it.string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5817 *pos = it.current; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5818 |
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
|
5819 #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
|
5820 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
|
5821 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5822 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
|
5823 && !NILP (img->spec)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5824 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5825 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5826 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5827 |
65016
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5828 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
|
5829 && (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
|
5830 row->enabled_p)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5831 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5832 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
|
5833 { |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5834 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
|
5835 #ifdef HAVE_WINDOW_SYSTEM |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5836 if (img) |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5837 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5838 *dy -= row->ascent - glyph->ascent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5839 *dx += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5840 *dy += glyph->slice.y; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5841 /* 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
|
5842 *width = img->width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5843 *height = img->height; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5844 } |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5845 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5846 #endif |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5847 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5848 *width = glyph->pixel_width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5849 *height = glyph->ascent + glyph->descent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5850 } |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5851 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5852 else |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5853 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5854 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5855 *height = row->height; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5856 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5857 } |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5858 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5859 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5860 *width = *height = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5861 } |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5862 |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5863 /* 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
|
5864 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
|
5865 if (x0 > x1) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5866 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
|
5867 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5868 *x = it.hpos; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5869 *y = it.vpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5870 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5871 return string; |
25012 | 5872 } |
5873 | |
5874 | |
5875 /* 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
|
5876 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
|
5877 *CHARPOS is set to the position in the string returned. */ |
25012 | 5878 |
5879 Lisp_Object | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5880 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
25012 | 5881 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5882 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5883 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5884 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5885 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5886 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5887 int *width, *height; |
25012 | 5888 { |
5889 struct glyph_row *row; | |
5890 struct glyph *glyph, *end; | |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5891 int x0, y0; |
25012 | 5892 Lisp_Object string = Qnil; |
5893 | |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5894 if (part == ON_MODE_LINE) |
25012 | 5895 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
5896 else | |
25546 | 5897 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
|
5898 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5899 *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
|
5900 |
25012 | 5901 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
|
5902 { |
25012 | 5903 /* Find the glyph under X. If we find one with a string object, |
5904 it's the one we were looking for. */ | |
5905 glyph = row->glyphs[TEXT_AREA]; | |
5906 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
|
5907 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
|
5908 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5909 *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
|
5910 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5911 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5912 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5913 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5914 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5915 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5916 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5917 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5918 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5919 struct image *img; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5920 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
|
5921 if (img != NULL) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5922 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5923 y0 -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5924 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5925 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5926 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5927 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5928 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5929 /* 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
|
5930 *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
|
5931 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5932 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5933 } |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5934 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5935 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5936 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5937 *x = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5938 x0 = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5939 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5940 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5941 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5942 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5943 *dy = y0; |
25012 | 5944 |
5945 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5946 } |
25012 | 5947 |
5948 | |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5949 /* 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
|
5950 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
|
5951 the string returned. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5952 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5953 Lisp_Object |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5954 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
|
5955 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5956 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5957 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5958 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5959 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5960 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5961 int *width, *height; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5962 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5963 struct glyph_row *row = w->current_matrix->rows; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5964 struct glyph *glyph, *end; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5965 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
|
5966 int area; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5967 Lisp_Object string = Qnil; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5968 |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5969 if (part == ON_LEFT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5970 area = LEFT_MARGIN_AREA; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5971 else if (part == ON_RIGHT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5972 area = RIGHT_MARGIN_AREA; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5973 else |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5974 abort (); |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5975 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5976 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
|
5977 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5978 break; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5979 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5980 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5981 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5982 if (row->enabled_p) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5983 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5984 /* 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
|
5985 it's the one we were looking for. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5986 if (area == RIGHT_MARGIN_AREA) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5987 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
|
5988 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5989 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5990 + 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
|
5991 + window_box_width (w, TEXT_AREA)); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5992 else |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5993 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
|
5994 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5995 : 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5996 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5997 glyph = row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5998 end = glyph + row->used[area]; |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
5999 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
|
6000 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6001 *x = glyph - row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6002 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6003 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6004 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6005 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6006 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6007 *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
|
6008 #ifdef HAVE_WINDOW_SYSTEM |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6009 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
|
6010 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6011 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6012 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
|
6013 if (img != NULL) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6014 *object = img->spec; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6015 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
|
6016 x0 += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6017 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
|
6018 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6019 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6020 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6021 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6022 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6023 /* 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
|
6024 *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
|
6025 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6026 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6027 } |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6028 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6029 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6030 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6031 x0 = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6032 *x = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6033 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6034 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6035 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6036 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6037 *dy = y0; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6038 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6039 return string; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6040 } |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6041 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6042 |
25012 | 6043 /*********************************************************************** |
6044 Changing Frame Sizes | |
6045 ***********************************************************************/ | |
314 | 6046 |
6047 #ifdef SIGWINCH | |
25012 | 6048 |
493 | 6049 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
6050 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 6051 int signalnum; /* some compilers complain in signal calls. */ |
314 | 6052 { |
6053 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6054 #ifndef USE_CRT_DLL |
314 | 6055 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6056 #endif |
314 | 6057 int old_errno = errno; |
6058 | |
82989
f3845715a5f6
Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
6059 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
|
6060 |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6061 signal (SIGWINCH, window_change_signal); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6062 SIGNAL_THREAD_CHECK (signalnum); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6063 |
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
|
6064 /* 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
|
6065 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
|
6066 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
|
6067 */ |
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
|
6068 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
|
6069 |
53341 | 6070 if (! tty->term_initted) |
6071 continue; | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6072 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6073 get_tty_size (fileno (tty->input), &width, &height); |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6074 |
83412
573105015a96
Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann)
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
6075 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
|
6076 Lisp_Object tail, frame; |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6077 |
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
|
6078 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
|
6079 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
|
6080 /* 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
|
6081 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
|
6082 signal handler. */ |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6083 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
|
6084 } |
314 | 6085 } |
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
|
6086 |
314 | 6087 errno = old_errno; |
6088 } | |
6089 #endif /* SIGWINCH */ | |
6090 | |
6091 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6092 /* 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
|
6093 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
|
6094 safe to change frame sizes while a redisplay is in progress. */ |
314 | 6095 |
21514 | 6096 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6097 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6098 int safe; |
314 | 6099 { |
6100 /* 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
|
6101 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6102 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6103 |
314 | 6104 while (delayed_size_change) |
6105 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6106 Lisp_Object tail, frame; |
314 | 6107 |
6108 delayed_size_change = 0; | |
6109 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6110 FOR_EACH_FRAME (tail, frame) |
314 | 6111 { |
25012 | 6112 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
|
6113 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6114 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
|
6115 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
|
6116 0, 0, safe); |
314 | 6117 } |
6118 } | |
6119 } | |
6120 | |
6121 | |
764 | 6122 /* 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
|
6123 indicate no change is to take place. |
314 | 6124 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6125 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
|
6126 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
|
6127 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
|
6128 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6129 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6130 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
|
6131 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
|
6132 |
21514 | 6133 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6134 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6135 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6136 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6137 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6138 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
|
6139 |
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
|
6140 if (FRAME_MSDOS_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6141 { |
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
|
6142 /* 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
|
6143 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
|
6144 ttys. */ |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6145 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
|
6146 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6147 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
|
6148 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6149 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6150 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6151 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
|
6152 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6153 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6154 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6155 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6156 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6157 int newheight, newwidth, pretend, delay, safe; |
314 | 6158 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6159 int new_frame_total_cols; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6160 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
|
6161 |
314 | 6162 /* 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
|
6163 if (delay || (redisplaying_p && !safe)) |
314 | 6164 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6165 f->new_text_lines = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6166 f->new_text_cols = newwidth; |
314 | 6167 delayed_size_change = 1; |
6168 return; | |
6169 } | |
6170 | |
764 | 6171 /* 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
|
6172 f->new_text_lines = 0; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6173 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
|
6174 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6175 /* 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
|
6176 if (newheight == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6177 newheight = FRAME_LINES (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6178 if (newwidth == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6179 newwidth = FRAME_COLS (f); |
25012 | 6180 |
6181 /* Compute width of windows in F. | |
6182 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
|
6183 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
|
6184 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6185 /* Round up to the smallest acceptable size. */ |
25012 | 6186 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
|
6187 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6188 /* 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
|
6189 if (newheight == FRAME_LINES (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6190 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
314 | 6191 return; |
6192 | |
15078 | 6193 BLOCK_INPUT; |
6194 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6195 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6196 /* 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
|
6197 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
|
6198 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6199 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6200 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6201 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6202 if (newheight != FRAME_LINES (f)) |
314 | 6203 { |
25012 | 6204 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 6205 { |
25012 | 6206 /* 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
|
6207 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
25012 | 6208 FRAME_TOP_MARGIN (f)); |
6209 set_window_height (FRAME_ROOT_WINDOW (f), | |
6210 (newheight | |
6211 - 1 | |
6212 - FRAME_TOP_MARGIN (f)), | |
6213 0); | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6214 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
|
6215 newheight - 1); |
25012 | 6216 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 6217 } |
6218 else | |
764 | 6219 /* Frame has just one top-level window. */ |
25012 | 6220 set_window_height (FRAME_ROOT_WINDOW (f), |
6221 newheight - FRAME_TOP_MARGIN (f), 0); | |
6222 | |
6223 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
|
6224 FrameRows (FRAME_TTY (f)) = newheight; |
314 | 6225 } |
6226 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6227 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
314 | 6228 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6229 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6230 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
|
6231 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6232 |
6233 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
|
6234 FrameCols (FRAME_TTY (f)) = newwidth; |
25012 | 6235 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6236 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
|
6237 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
314 | 6238 } |
6239 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6240 FRAME_LINES (f) = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6241 SET_FRAME_COLS (f, newwidth); |
25012 | 6242 |
6243 { | |
6244 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
6245 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
|
6246 |
25012 | 6247 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
6248 &text_area_height); | |
6249 if (w->cursor.x >= text_area_x + text_area_width) | |
6250 w->cursor.hpos = w->cursor.x = 0; | |
6251 if (w->cursor.y >= text_area_y + text_area_height) | |
6252 w->cursor.vpos = w->cursor.y = 0; | |
6253 } | |
6254 | |
6255 adjust_glyphs (f); | |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6256 calculate_costs (f); |
25012 | 6257 SET_FRAME_GARBAGED (f); |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6258 f->resized_p = 1; |
15065 | 6259 |
6260 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6261 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6262 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
|
6263 |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6264 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
25012 | 6265 Fset_window_buffer (FRAME_SELECTED_WINDOW (f), |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6266 XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer, Qt); |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6267 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6268 unbind_to (count, Qnil); |
314 | 6269 } |
25012 | 6270 |
6271 | |
314 | 6272 |
25012 | 6273 /*********************************************************************** |
6274 Terminal Related Lisp Functions | |
6275 ***********************************************************************/ | |
6276 | |
6277 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6278 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
|
6279 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
|
6280 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
|
6281 (file) |
25012 | 6282 Lisp_Object file; |
6283 { | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6284 struct tty_display_info *tty; |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6285 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6286 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6287 error ("Current frame is not on a tty device"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6288 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6289 tty = CURTTY (); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6290 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6291 if (tty->termscript != 0) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6292 fclose (tty->termscript); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6293 tty->termscript = 0; |
25012 | 6294 |
6295 if (! NILP (file)) | |
6296 { | |
6297 file = Fexpand_file_name (file, Qnil); | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6298 tty->termscript = fopen (SDATA (file), "w"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6299 if (tty->termscript == 0) |
25012 | 6300 report_file_error ("Opening termscript", Fcons (file, Qnil)); |
6301 } | |
6302 return Qnil; | |
6303 } | |
6304 | |
6305 | |
314 | 6306 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
|
6307 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
|
6308 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
|
6309 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
|
6310 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6311 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
|
6312 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
|
6313 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
|
6314 (string, terminal) |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6315 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
|
6316 Lisp_Object terminal; |
314 | 6317 { |
83512
5d328dadd0f4
Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83510
diff
changeset
|
6318 struct terminal *t = get_tty_terminal (terminal, 1); |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6319 struct tty_display_info *tty; |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6320 |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6321 /* ??? 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
|
6322 CHECK_STRING (string); |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6323 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6324 if (!t) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6325 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
|
6326 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6327 tty = t->display_info.tty; |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6328 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6329 if (tty->termscript) |
314 | 6330 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6331 fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6332 fflush (tty->termscript); |
314 | 6333 } |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6334 fwrite (SDATA (string), 1, SBYTES (string), tty->output); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6335 fflush (tty->output); |
314 | 6336 return Qnil; |
6337 } | |
6338 | |
25012 | 6339 |
314 | 6340 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
|
6341 doc: /* Beep, or flash the screen. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6342 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
|
6343 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
|
6344 (arg) |
314 | 6345 Lisp_Object arg; |
6346 { | |
493 | 6347 if (!NILP (arg)) |
314 | 6348 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6349 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6350 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6351 else |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6352 ring_bell (XFRAME (selected_frame)); |
314 | 6353 } |
6354 else | |
6355 bitch_at_user (); | |
6356 | |
6357 return Qnil; | |
6358 } | |
6359 | |
21514 | 6360 void |
314 | 6361 bitch_at_user () |
6362 { | |
6363 if (noninteractive) | |
6364 putchar (07); | |
25012 | 6365 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6366 error ("Keyboard macro terminated by a command ringing the bell"); |
6367 else | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6368 ring_bell (XFRAME (selected_frame)); |
314 | 6369 } |
6370 | |
25012 | 6371 |
6372 | |
6373 /*********************************************************************** | |
6374 Sleeping, Waiting | |
6375 ***********************************************************************/ | |
6376 | |
314 | 6377 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
|
6378 doc: /* Pause, without updating display, for SECONDS seconds. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6379 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
|
6380 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
|
6381 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
|
6382 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
|
6383 \(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
|
6384 (seconds, milliseconds) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6385 Lisp_Object seconds, milliseconds; |
314 | 6386 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6387 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6388 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6389 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
|
6390 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
|
6391 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6392 CHECK_NUMBER (milliseconds); |
2648 | 6393 usec = XINT (milliseconds) * 1000; |
6394 | |
6395 { | |
6396 double duration = extract_float (seconds); | |
6397 sec = (int) duration; | |
6398 usec += (duration - sec) * 1000000; | |
6399 } | |
314 | 6400 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6401 #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
|
6402 if (sec == 0 && usec != 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6403 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
|
6404 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6405 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6406 /* 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
|
6407 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6408 { |
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
|
6409 /* 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
|
6410 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6411 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6412 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6413 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
|
6414 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6415 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6416 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
|
6417 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6418 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6419 return Qnil; |
6420 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6421 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0); |
314 | 6422 |
6423 return Qnil; | |
6424 } | |
6425 | |
25012 | 6426 |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6427 /* This is just like wait_reading_process_output, except that |
650 | 6428 it does the redisplay. |
6429 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6430 It's also much like Fsit_for, except that it can be used for |
11411
91bcce2fd486
(Fframe_or_buffer_changed_p): Ignore buffers whose names start with space.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
6431 waiting for input as well. */ |
650 | 6432 |
6433 Lisp_Object | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6434 sit_for (sec, usec, reading, display, initial_display) |
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6435 int sec, usec, reading, display, initial_display; |
314 | 6436 { |
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6437 swallow_events (display); |
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6438 |
71138
5cf77229c85d
(sit_for): Perform redisplay even if input is pending
Kim F. Storm <storm@cua.dk>
parents:
70300
diff
changeset
|
6439 if ((detect_input_pending_run_timers (display) |
5cf77229c85d
(sit_for): Perform redisplay even if input is pending
Kim F. Storm <storm@cua.dk>
parents:
70300
diff
changeset
|
6440 && !redisplay_dont_pause) |
5cf77229c85d
(sit_for): Perform redisplay even if input is pending
Kim F. Storm <storm@cua.dk>
parents:
70300
diff
changeset
|
6441 || !NILP (Vexecuting_kbd_macro)) |
314 | 6442 return Qnil; |
650 | 6443 |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6444 if (initial_display) |
35336
002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents:
35307
diff
changeset
|
6445 redisplay_preserve_echo_area (2); |
314 | 6446 |
673 | 6447 if (sec == 0 && usec == 0) |
6448 return Qt; | |
6449 | |
314 | 6450 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6451 gobble_input (0); |
650 | 6452 #endif |
6453 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6454 wait_reading_process_output (sec, usec, reading ? -1 : 1, display, |
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6455 Qnil, NULL, 0); |
650 | 6456 |
314 | 6457 return detect_input_pending () ? Qnil : Qt; |
6458 } | |
6459 | |
25012 | 6460 |
650 | 6461 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
40979 | 6462 doc: /* Perform redisplay, then wait for SECONDS seconds or until input is available. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6463 SECONDS may be a floating-point value, meaning that you can wait for a |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6464 fraction of a second. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6465 \(Not all operating systems support waiting for a fraction of a second.) |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6466 Optional arg NODISP non-nil means don't redisplay, just wait for input. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6467 Redisplay is preempted as always if input arrives, and does not happen |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6468 if input is available before it starts. |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6469 Value is t if waited the full time with no input arriving. |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6470 |
71211
623f01d9e470
Mention `redisplay-dont-pause' in doc string of
David Kastrup <dak@gnu.org>
parents:
71141
diff
changeset
|
6471 Redisplay will occur even when input is available if you bind |
623f01d9e470
Mention `redisplay-dont-pause' in doc string of
David Kastrup <dak@gnu.org>
parents:
71141
diff
changeset
|
6472 `redisplay-dont-pause' to a non-nil value. |
623f01d9e470
Mention `redisplay-dont-pause' in doc string of
David Kastrup <dak@gnu.org>
parents:
71141
diff
changeset
|
6473 |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6474 An obsolete but still supported form is |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6475 \(sit-for SECONDS &optional MILLISECONDS NODISP) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6476 Where the optional arg MILLISECONDS specifies an additional wait period, |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6477 in milliseconds; this was useful when Emacs was built without |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6478 floating point support. |
51413
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6479 usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */) |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6480 |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6481 /* The `old-nodisp' stuff is there so that the arglist has the correct |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6482 length. Otherwise, `defdvice' will redefine it with fewer args. */ |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6483 (seconds, milliseconds, nodisp) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6484 Lisp_Object seconds, milliseconds, nodisp; |
650 | 6485 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6486 int sec, usec; |
650 | 6487 |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6488 if (NILP (nodisp) && !NUMBERP (milliseconds)) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6489 { /* New style. */ |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6490 nodisp = milliseconds; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6491 milliseconds = Qnil; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6492 } |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6493 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6494 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
|
6495 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
|
6496 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6497 CHECK_NUMBER (milliseconds); |
2648 | 6498 usec = XINT (milliseconds) * 1000; |
6499 | |
6500 { | |
6501 double duration = extract_float (seconds); | |
6502 sec = (int) duration; | |
6503 usec += (duration - sec) * 1000000; | |
6504 } | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6505 |
650 | 6506 #ifndef EMACS_HAS_USECS |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6507 if (usec != 0 && sec == 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6508 error ("Millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 6509 #endif |
6510 | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6511 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
650 | 6512 } |
25012 | 6513 |
6514 | |
314 | 6515 |
25012 | 6516 /*********************************************************************** |
6517 Other Lisp Functions | |
6518 ***********************************************************************/ | |
6519 | |
6520 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6521 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
|
6522 buffer-modified-flags. */ |
25012 | 6523 |
6524 static Lisp_Object frame_and_buffer_state; | |
6525 | |
6526 | |
6527 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
|
6528 Sframe_or_buffer_changed_p, 0, 1, 0, |
40979 | 6529 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
|
6530 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
|
6531 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
|
6532 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
|
6533 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
|
6534 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
|
6535 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
|
6536 the current state. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6537 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6538 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
|
6539 pass nil for VARIABLE. */) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6540 (variable) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6541 Lisp_Object variable; |
25012 | 6542 { |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6543 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
|
6544 Lisp_Object *vecp, *end; |
25012 | 6545 int n; |
6546 | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6547 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6548 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6549 CHECK_SYMBOL (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6550 state = Fsymbol_value (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6551 if (! VECTORP (state)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6552 goto changed; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6553 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6554 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6555 state = frame_and_buffer_state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6556 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6557 vecp = XVECTOR (state)->contents; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6558 end = vecp + XVECTOR (state)->size; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6559 |
25012 | 6560 FOR_EACH_FRAME (tail, frame) |
6561 { | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6562 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6563 goto changed; |
25012 | 6564 if (!EQ (*vecp++, frame)) |
6565 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6566 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6567 goto changed; |
25012 | 6568 if (!EQ (*vecp++, XFRAME (frame)->name)) |
6569 goto changed; | |
6570 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6571 /* 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
|
6572 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6573 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6574 buf = XCDR (XCAR (tail)); |
25012 | 6575 /* 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
|
6576 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6577 continue; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6578 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6579 goto changed; |
25012 | 6580 if (!EQ (*vecp++, buf)) |
6581 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6582 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6583 goto changed; |
25012 | 6584 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
6585 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6586 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6587 goto changed; |
25012 | 6588 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
6589 goto changed; | |
6590 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6591 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6592 goto changed; |
25012 | 6593 /* Detect deletion of a buffer at the end of the list. */ |
6594 if (EQ (*vecp, Qlambda)) | |
6595 return Qnil; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6596 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6597 /* Come here if we decide the data has changed. */ |
25012 | 6598 changed: |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6599 /* 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
|
6600 Start with 1 so there is room for at least one lambda at the end. */ |
25012 | 6601 n = 1; |
6602 FOR_EACH_FRAME (tail, frame) | |
6603 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6604 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6605 n += 3; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6606 /* 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
|
6607 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
|
6608 if (! VECTORP (state) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6609 || n > XVECTOR (state)->size |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6610 || n + 20 < XVECTOR (state)->size / 2) |
25012 | 6611 /* 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
|
6612 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6613 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
|
6614 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6615 Fset (variable, state); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6616 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6617 frame_and_buffer_state = state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6618 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6619 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6620 /* 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
|
6621 vecp = XVECTOR (state)->contents; |
25012 | 6622 FOR_EACH_FRAME (tail, frame) |
6623 { | |
6624 *vecp++ = frame; | |
6625 *vecp++ = XFRAME (frame)->name; | |
6626 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6627 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6628 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6629 buf = XCDR (XCAR (tail)); |
25012 | 6630 /* 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
|
6631 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6632 continue; |
6633 *vecp++ = buf; | |
6634 *vecp++ = XBUFFER (buf)->read_only; | |
6635 *vecp++ = Fbuffer_modified_p (buf); | |
6636 } | |
6637 /* Fill up the vector with lambdas (always at least one). */ | |
6638 *vecp++ = Qlambda; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6639 while (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6640 < XVECTOR (state)->size) |
25012 | 6641 *vecp++ = Qlambda; |
6642 /* 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
|
6643 if (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6644 > XVECTOR (state)->size) |
25012 | 6645 abort (); |
6646 return Qt; | |
6647 } | |
6648 | |
6649 | |
6650 | |
6651 /*********************************************************************** | |
6652 Initialization | |
6653 ***********************************************************************/ | |
6654 | |
6655 /* Initialization done when Emacs fork is started, before doing stty. | |
6656 Determine terminal type and set terminal_driver. Then invoke its | |
6657 decoding routine to set up variables in the terminal package. */ | |
314 | 6658 |
21514 | 6659 void |
314 | 6660 init_display () |
6661 { | |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6662 char *terminal_type; |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6663 |
314 | 6664 #ifdef HAVE_X_WINDOWS |
6665 extern int display_arg; | |
6666 #endif | |
6667 | |
25012 | 6668 /* Construct the space glyph. */ |
6669 space_glyph.type = CHAR_GLYPH; | |
6670 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
6671 space_glyph.charpos = -1; | |
6672 | |
314 | 6673 inverse_video = 0; |
6674 cursor_in_echo_area = 0; | |
6675 terminal_type = (char *) 0; | |
6676 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6677 /* 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
|
6678 during startup. */ |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6679 Vinitial_window_system = Qnil; |
314 | 6680 |
83146
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6681 /* 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
|
6682 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
|
6683 automatically. */ |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6684 #ifdef SIGWINCH |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6685 #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
|
6686 if (initialized) |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6687 #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
|
6688 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
|
6689 #endif /* SIGWINCH */ |
314 | 6690 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6691 /* 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
|
6692 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
|
6693 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
|
6694 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6695 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6696 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
|
6697 try to use X, and die with an error message if that doesn't work. */ |
314 | 6698 |
6699 #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
|
6700 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
|
6701 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6702 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6703 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6704 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6705 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6706 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6707 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6708 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6709 display_arg = (display != 0 && *display != 0); |
69607
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6710 |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6711 if (display_arg && !x_display_ok (display)) |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6712 { |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6713 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
|
6714 display); |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6715 inhibit_window_system = 1; |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6716 } |
2364 | 6717 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6718 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6719 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
|
6720 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6721 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6722 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6723 ) |
314 | 6724 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6725 Vinitial_window_system = intern ("x"); |
314 | 6726 #ifdef HAVE_X11 |
6727 Vwindow_system_version = make_number (11); | |
6728 #else | |
6729 Vwindow_system_version = make_number (10); | |
6730 #endif | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6731 #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
|
6732 /* In some versions of ncurses, |
15282 | 6733 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
|
6734 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6735 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6736 #endif |
25012 | 6737 adjust_frame_glyphs_initially (); |
314 | 6738 return; |
6739 } | |
6740 #endif /* HAVE_X_WINDOWS */ | |
6741 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6742 #ifdef HAVE_NTGUI |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6743 if (!inhibit_window_system) |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6744 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6745 Vinitial_window_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6746 Vwindow_system_version = make_number (1); |
25012 | 6747 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6748 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6749 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6750 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6751 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6752 #ifdef MAC_OS |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6753 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
|
6754 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6755 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
|
6756 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
|
6757 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6758 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6759 } |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6760 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6761 |
314 | 6762 /* If no window system has been specified, try to use the terminal. */ |
6763 if (! isatty (0)) | |
6764 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6765 fatal ("standard input is not a tty"); |
314 | 6766 exit (1); |
6767 } | |
6768 | |
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
|
6769 /* Look at the TERM variable. */ |
314 | 6770 terminal_type = (char *) getenv ("TERM"); |
6771 if (!terminal_type) | |
6772 { | |
6773 #ifdef VMS | |
6774 fprintf (stderr, "Please specify your terminal type.\n\ | |
6775 For types defined in VMS, use set term /device=TYPE.\n\ | |
6776 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6777 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
6778 #else | |
6779 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
6780 #endif | |
6781 exit (1); | |
6782 } | |
6783 | |
6784 #ifdef VMS | |
25012 | 6785 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6786 Hardly any uppercase letters in terminal types; should be none. */ |
6787 { | |
6788 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6789 char *p; | |
6790 | |
6791 strcpy (new, terminal_type); | |
6792 | |
6793 for (p = new; *p; p++) | |
6794 if (isupper (*p)) | |
6795 *p = tolower (*p); | |
6796 | |
6797 terminal_type = new; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6798 } |
25012 | 6799 #endif /* VMS */ |
314 | 6800 |
53341 | 6801 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6802 struct terminal *t; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6803 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
|
6804 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6805 /* 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
|
6806 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
|
6807 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6808 /* 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
|
6809 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
|
6810 abort (); |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6811 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
|
6812 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
|
6813 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6814 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
|
6815 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
|
6816 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
|
6817 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
|
6818 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
|
6819 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6820 /* 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
|
6821 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
|
6822 && 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
|
6823 (*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
|
6824 |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6825 /* Update frame parameters to reflect the new type. */ |
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
|
6826 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); |
83074
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6827 Fmodify_frame_parameters |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6828 (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
|
6829 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
|
6830 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); |
53341 | 6831 } |
6832 | |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6833 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6834 struct frame *sf = SELECTED_FRAME (); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6835 int width = FRAME_TOTAL_COLS (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6836 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
|
6837 |
25012 | 6838 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6839 | |
6840 /* If these sizes are so big they cause overflow, just ignore the | |
6841 change. It's not clear what better we could do. */ | |
6842 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
|
6843 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
|
6844 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6845 |
25012 | 6846 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6847 calculate_costs (XFRAME (selected_frame)); |
314 | 6848 |
25012 | 6849 /* Set up faces of the initial terminal frame of a dumped Emacs. */ |
6850 if (initialized | |
6851 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6852 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6853 /* 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
|
6854 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
|
6855 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
|
6856 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6857 && (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
|
6858 #endif |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6859 && 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
|
6860 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6861 /* 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
|
6862 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
|
6863 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
|
6864 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6865 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
|
6866 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
|
6867 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
|
6868 } |
314 | 6869 } |
25012 | 6870 |
6871 | |
314 | 6872 |
25012 | 6873 /*********************************************************************** |
6874 Blinking cursor | |
6875 ***********************************************************************/ | |
6876 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6877 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
|
6878 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
|
6879 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
|
6880 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
|
6881 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
|
6882 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
|
6883 (window, show) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6884 Lisp_Object window, show; |
25012 | 6885 { |
6886 /* Don't change cursor state while redisplaying. This could confuse | |
6887 output routines. */ | |
6888 if (!redisplaying_p) | |
6889 { | |
6890 if (NILP (window)) | |
6891 window = selected_window; | |
6892 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6893 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6894 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6895 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6896 } |
6897 | |
6898 return Qnil; | |
6899 } | |
6900 | |
6901 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6902 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
|
6903 Sinternal_show_cursor_p, 0, 1, 0, |
40979 | 6904 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
|
6905 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
|
6906 (window) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6907 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6908 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6909 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6910 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6911 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6912 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6913 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6914 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6915 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6916 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6917 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
|
6918 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6919 |
25012 | 6920 |
6921 /*********************************************************************** | |
6922 Initialization | |
6923 ***********************************************************************/ | |
6924 | |
21514 | 6925 void |
314 | 6926 syms_of_display () |
6927 { | |
764 | 6928 defsubr (&Sredraw_frame); |
314 | 6929 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6930 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6931 defsubr (&Sopen_termscript); |
6932 defsubr (&Sding); | |
6933 defsubr (&Ssit_for); | |
6934 defsubr (&Ssleep_for); | |
6935 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6936 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6937 defsubr (&Sinternal_show_cursor_p); |
314 | 6938 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6939 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6940 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6941 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6942 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6943 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
|
6944 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6945 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6946 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6947 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6948 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6949 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6950 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6951 DEFVAR_INT ("baud-rate", &baud_rate, |
40979 | 6952 doc: /* *The output baud rate of the terminal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6953 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
|
6954 and the other strategic decisions made during redisplay. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6955 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6956 DEFVAR_BOOL ("inverse-video", &inverse_video, |
40979 | 6957 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
|
6958 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
|
6959 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6960 DEFVAR_BOOL ("visible-bell", &visible_bell, |
40979 | 6961 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
|
6962 |
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6963 See also `ring-bell-function'. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6964 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6965 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
40979 | 6966 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
|
6967 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
|
6968 Emacs's frame display when you reenter Emacs. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6969 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
|
6970 |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6971 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
|
6972 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
|
6973 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
|
6974 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
|
6975 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6976 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
40979 | 6977 doc: /* The version number of the window system in use. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6978 For X windows, this is 10 or 11. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6979 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6980 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
40979 | 6981 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
|
6982 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6983 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
40979 | 6984 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
|
6985 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
|
6986 Each element can be: |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6987 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
|
6988 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
|
6989 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
|
6990 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
|
6991 while outputting it. */); |
314 | 6992 Vglyph_table = Qnil; |
6993 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6994 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
40979 | 6995 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
|
6996 See `buffer-display-table' for more information. */); |
314 | 6997 Vstandard_display_table = Qnil; |
6998 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6999 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
40979 | 7000 doc: /* *Non-nil means update isn't paused when input is detected. */); |
25012 | 7001 redisplay_dont_pause = 0; |
7002 | |
314 | 7003 /* Initialize `window-system', unless init_display already decided it. */ |
7004 #ifdef CANNOT_DUMP | |
7005 if (noninteractive) | |
7006 #endif | |
7007 { | |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7008 Vinitial_window_system = Qnil; |
314 | 7009 Vwindow_system_version = Qnil; |
7010 } | |
7011 } | |
52401 | 7012 |
7013 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
7014 (do not change this comment) */ |