Mercurial > emacs
annotate src/dispnew.c @ 55338:3fe6300a67bf
*** empty log message ***
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Mon, 03 May 2004 13:51:59 +0000 |
| parents | 78fbab658433 |
| children | 069e4841ceb2 30dd490f06f2 4c90ffeb71c5 |
| rev | line source |
|---|---|
| 314 | 1 /* Updating of data structures for redisplay. |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
2 Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,03,04 |
|
18853
4501a367a887
(direct_output_forward_char): Reenable check against
Richard M. Stallman <rms@gnu.org>
parents:
18774
diff
changeset
|
3 Free Software Foundation, Inc. |
| 314 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
| 7 GNU Emacs is free software; you can redistribute it and/or modify | |
| 8 it under the terms of the GNU General Public License as published by | |
|
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
| 314 | 10 any later version. |
| 11 | |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 314 | 21 |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
22 #include <config.h> |
| 314 | 23 #include <signal.h> |
|
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
24 #include <stdio.h> |
| 314 | 25 #include <ctype.h> |
| 26 | |
| 21514 | 27 #ifdef HAVE_UNISTD_H |
| 28 #include <unistd.h> | |
| 29 #endif | |
| 30 | |
|
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
31 #include "lisp.h" |
| 314 | 32 #include "termchar.h" |
| 33 #include "termopts.h" | |
| 2198 | 34 #include "termhooks.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" |
| 314 | 42 #include "window.h" |
| 43 #include "commands.h" | |
| 44 #include "disptab.h" | |
| 45 #include "indent.h" | |
|
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
46 #include "intervals.h" |
| 15065 | 47 #include "blockinput.h" |
| 21514 | 48 #include "process.h" |
| 314 | 49 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
50 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 include the following file. */ |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
52 /* #include "systty.h" */ |
| 12917 | 53 #include "syssignal.h" |
| 554 | 54 |
| 314 | 55 #ifdef HAVE_X_WINDOWS |
| 56 #include "xterm.h" | |
| 25012 | 57 #endif /* HAVE_X_WINDOWS */ |
| 314 | 58 |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 #ifdef HAVE_NTGUI |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #include "w32term.h" |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 #endif /* HAVE_NTGUI */ |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
62 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
63 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
64 #include "macterm.h" |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
65 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
66 |
| 25012 | 67 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
| 68 | |
|
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
69 #include "systime.h" |
|
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
70 #include <errno.h> |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
71 |
| 25012 | 72 /* To get the prototype for `sleep'. */ |
| 73 | |
| 74 #ifdef HAVE_UNISTD_H | |
| 75 #include <unistd.h> | |
| 76 #endif | |
| 77 | |
| 314 | 78 /* Get number of chars of output now in the buffer of a stdio stream. |
| 25012 | 79 This ought to be built in in stdio, but it isn't. Some s- files |
| 80 override this because their stdio internals differ. */ | |
| 81 | |
|
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
82 #ifdef __GNU_LIBRARY__ |
| 25012 | 83 |
| 84 /* The s- file might have overridden the definition with one that | |
| 85 works for the system's C library. But we are using the GNU C | |
| 86 library, so this is the right definition for every system. */ | |
| 87 | |
|
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
88 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
89 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
90 #else |
|
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
91 #undef PENDING_OUTPUT_COUNT |
|
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
92 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) |
|
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
93 #endif |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
94 #else /* not __GNU_LIBRARY__ */ |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
95 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
96 #include <stdio_ext.h> |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
97 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE) |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
98 #endif |
|
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
99 #ifndef PENDING_OUTPUT_COUNT |
| 314 | 100 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
| 101 #endif | |
| 25012 | 102 #endif /* not __GNU_LIBRARY__ */ |
| 103 | |
|
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
104 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
| 29437 | 105 #include <term.h> /* for tgetent */ |
| 106 #endif | |
| 25012 | 107 |
| 108 /* Structure to pass dimensions around. Used for character bounding | |
| 109 boxes, glyph matrix dimensions and alike. */ | |
| 110 | |
| 111 struct dim | |
| 112 { | |
| 113 int width; | |
| 114 int height; | |
| 115 }; | |
| 116 | |
| 117 | |
| 118 /* Function prototypes. */ | |
| 119 | |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
120 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
121 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
122 static void fake_current_matrices P_ ((Lisp_Object)); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
123 static void redraw_overlapping_rows P_ ((struct window *, int)); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
124 static void redraw_overlapped_rows P_ ((struct window *, int)); |
| 25012 | 125 static int count_blanks P_ ((struct glyph *, int)); |
| 126 static int count_match P_ ((struct glyph *, struct glyph *, | |
| 127 struct glyph *, struct glyph *)); | |
| 128 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
| 129 static void update_frame_line P_ ((struct frame *, int)); | |
| 130 static struct dim allocate_matrices_for_frame_redisplay | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
131 P_ ((Lisp_Object, int, int, int, int *)); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
132 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
| 25012 | 133 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
| 134 static void adjust_frame_glyphs P_ ((struct frame *)); | |
| 135 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
| 136 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
| 137 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
| 138 int, int, struct dim)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
139 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
| 25012 | 140 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
|
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
141 #if GLYPH_DEBUG |
| 25012 | 142 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
143 #endif |
| 25012 | 144 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
| 145 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
| 146 struct window *)); | |
| 147 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
| 148 struct window *)); | |
| 149 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
| 150 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
| 151 static void adjust_frame_glyphs_initially P_ ((void)); | |
| 152 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
| 153 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
| 154 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
| 155 static void build_frame_matrix P_ ((struct frame *)); | |
| 156 void clear_current_matrices P_ ((struct frame *)); | |
| 157 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
| 158 int, int)); | |
| 159 static void clear_window_matrices P_ ((struct window *, int)); | |
| 160 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
| 161 static int scrolling_window P_ ((struct window *, int)); | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
162 static int update_window_line P_ ((struct window *, int, int *)); |
| 25012 | 163 static void update_marginal_area P_ ((struct window *, int, int)); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
164 static int update_text_area P_ ((struct window *, int)); |
| 25012 | 165 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
| 166 int)); | |
| 167 static void mirror_make_current P_ ((struct window *, int)); | |
| 168 void check_window_matrix_pointers P_ ((struct window *)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
169 #if GLYPH_DEBUG |
| 25012 | 170 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
| 171 struct glyph_matrix *)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
172 #endif |
| 25012 | 173 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
| 174 static int update_window_tree P_ ((struct window *, int)); | |
| 175 static int update_window P_ ((struct window *, int)); | |
| 176 static int update_frame_1 P_ ((struct frame *, int, int)); | |
| 177 static void set_window_cursor_after_update P_ ((struct window *)); | |
| 178 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
179 struct glyph_row *, int)); |
| 25012 | 180 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
| 181 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
| 182 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
| 183 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
184 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
185 struct window *frame_row_to_window P_ ((struct window *, int)); |
| 25012 | 186 |
| 187 | |
| 188 /* Non-zero means don't pause redisplay for pending input. (This is | |
| 189 for debugging and for a future implementation of EDT-like | |
| 190 scrolling. */ | |
| 191 | |
| 192 int redisplay_dont_pause; | |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
193 |
| 554 | 194 /* Nonzero upon entry to redisplay means do not assume anything about |
| 764 | 195 current contents of actual terminal frame; clear and redraw it. */ |
| 314 | 196 |
| 764 | 197 int frame_garbaged; |
| 314 | 198 |
| 25012 | 199 /* Nonzero means last display completed. Zero means it was preempted. */ |
| 314 | 200 |
| 201 int display_completed; | |
| 202 | |
| 25012 | 203 /* Lisp variable visible-bell; enables use of screen-flash instead of |
| 204 audible bell. */ | |
| 314 | 205 |
| 206 int visible_bell; | |
| 207 | |
| 764 | 208 /* Invert the color of the whole frame, at a low level. */ |
| 314 | 209 |
| 210 int inverse_video; | |
| 211 | |
| 212 /* Line speed of the terminal. */ | |
| 213 | |
|
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42835
diff
changeset
|
214 EMACS_INT baud_rate; |
| 314 | 215 |
| 25012 | 216 /* Either nil or a symbol naming the window system under which Emacs |
| 217 is running. */ | |
| 314 | 218 |
| 219 Lisp_Object Vwindow_system; | |
| 220 | |
| 221 /* Version number of X windows: 10, 11 or nil. */ | |
| 25012 | 222 |
| 314 | 223 Lisp_Object Vwindow_system_version; |
| 224 | |
| 25012 | 225 /* Vector of glyph definitions. Indexed by glyph number, the contents |
| 226 are a string which is how to output the glyph. | |
| 314 | 227 |
| 228 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
| 25012 | 229 as a character code. |
| 230 | |
| 231 This is an obsolete feature that is no longer used. The variable | |
| 232 is retained for compatibility. */ | |
| 314 | 233 |
| 234 Lisp_Object Vglyph_table; | |
| 235 | |
| 236 /* Display table to use for vectors that don't specify their own. */ | |
| 237 | |
| 238 Lisp_Object Vstandard_display_table; | |
| 239 | |
| 25012 | 240 /* Nonzero means reading single-character input with prompt so put |
|
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Jan?k <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
241 cursor on mini-buffer after the prompt. Positive means at end of |
| 25012 | 242 text in echo area; negative means at beginning of line. */ |
| 243 | |
| 314 | 244 int cursor_in_echo_area; |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
245 |
|
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
246 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
| 25012 | 247 |
| 314 | 248 |
| 25012 | 249 /* The currently selected frame. In a single-frame version, this |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
250 variable always equals the_only_frame. */ |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
251 |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
252 Lisp_Object selected_frame; |
| 25012 | 253 |
| 254 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
| 764 | 255 frames. This is usually the most recent such frame that was |
| 9572 | 256 selected. In a single-frame version, this variable always holds |
| 257 the address of the_only_frame. */ | |
| 25012 | 258 |
| 259 struct frame *last_nonminibuf_frame; | |
| 260 | |
| 261 /* Stdio stream being used for copy of all output. */ | |
| 262 | |
| 263 FILE *termscript; | |
| 264 | |
| 265 /* Structure for info on cursor positioning. */ | |
| 266 | |
| 267 struct cm Wcm; | |
| 268 | |
| 269 /* 1 means SIGWINCH happened when not safe. */ | |
| 270 | |
| 271 int delayed_size_change; | |
| 272 | |
| 273 /* 1 means glyph initialization has been completed at startup. */ | |
| 274 | |
| 275 static int glyphs_initialized_initially_p; | |
| 276 | |
| 277 /* Updated window if != 0. Set by update_window. */ | |
| 278 | |
| 279 struct window *updated_window; | |
| 280 | |
| 281 /* Glyph row updated in update_window_line, and area that is updated. */ | |
| 282 | |
| 283 struct glyph_row *updated_row; | |
| 284 int updated_area; | |
| 285 | |
| 286 /* A glyph for a space. */ | |
| 287 | |
| 288 struct glyph space_glyph; | |
| 289 | |
| 290 /* Non-zero means update has been performed directly, so that there's | |
| 291 no need for redisplay_internal to do much work. Set by | |
| 292 direct_output_for_insert. */ | |
| 293 | |
| 294 int redisplay_performed_directly_p; | |
| 295 | |
| 296 /* Counts of allocated structures. These counts serve to diagnose | |
| 297 memory leaks and double frees. */ | |
| 298 | |
| 299 int glyph_matrix_count; | |
| 300 int glyph_pool_count; | |
| 301 | |
| 302 /* If non-null, the frame whose frame matrices are manipulated. If | |
| 303 null, window matrices are worked on. */ | |
| 304 | |
| 305 static struct frame *frame_matrix_frame; | |
| 306 | |
| 307 /* Current interface for window-based redisplay. Set from init_xterm. | |
| 308 A null value means we are not using window-based redisplay. */ | |
| 309 | |
| 310 struct redisplay_interface *rif; | |
| 311 | |
| 312 /* Non-zero means that fonts have been loaded since the last glyph | |
| 313 matrix adjustments. Redisplay must stop, and glyph matrices must | |
| 314 be adjusted when this flag becomes non-zero during display. The | |
| 315 reason fonts can be loaded so late is that fonts of fontsets are | |
| 316 loaded on demand. */ | |
| 317 | |
| 318 int fonts_changed_p; | |
| 319 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
320 /* Convert vpos and hpos from frame to window and vice versa. |
| 25012 | 321 This may only be used for terminal frames. */ |
| 322 | |
| 323 #if GLYPH_DEBUG | |
| 324 | |
| 325 static int window_to_frame_vpos P_ ((struct window *, int)); | |
| 326 static int window_to_frame_hpos P_ ((struct window *, int)); | |
| 327 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
| 328 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
| 329 | |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
330 /* 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
|
331 information. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
332 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
333 struct redisplay_history |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 char trace[512 + 100]; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 }; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
338 /* The size of the history buffer. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
339 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
340 #define REDISPLAY_HISTORY_SIZE 30 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 /* The redisplay history buffer. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 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
|
345 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 /* Next free entry in redisplay_history. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 static int history_idx; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 /* 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
|
351 history. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 static unsigned history_tick; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 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
|
356 static void add_window_display_history P_ ((struct window *, char *, int)); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
358 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 /* 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
|
360 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
|
361 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
|
362 has been interrupted for pending input. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 static void |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 add_window_display_history (w, msg, paused_p) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 struct window *w; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 char *msg; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 int paused_p; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 char *buf; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
371 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
372 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 history_idx = 0; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 buf = redisplay_history[history_idx].trace; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 ++history_idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
376 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 sprintf (buf, "%d: window %p (`%s')%s\n", |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 history_tick++, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 w, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 ((BUFFERP (w->buffer) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 && 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
|
382 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 : "???"), |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 paused_p ? " ***paused***" : ""); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 strcat (buf, msg); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
386 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 /* 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
|
390 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
|
391 pending input. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 static void |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 add_frame_display_history (f, paused_p) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 struct frame *f; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 int paused_p; |
|
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 char *buf; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
399 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
400 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 history_idx = 0; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 buf = redisplay_history[history_idx].trace; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 ++history_idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
404 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 sprintf (buf, "%d: update frame %p%s", |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 history_tick++, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 f, paused_p ? " ***paused***" : ""); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 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
|
413 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
|
414 () |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 int i; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
418 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
|
419 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
420 if (i < 0) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 i = REDISPLAY_HISTORY_SIZE - 1; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
423 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
424 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
425 return Qnil; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
427 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
428 |
| 25012 | 429 #else /* GLYPH_DEBUG == 0 */ |
| 430 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
431 #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
|
432 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
| 25012 | 433 |
| 434 #endif /* GLYPH_DEBUG == 0 */ | |
| 435 | |
| 436 | |
| 437 /* Like bcopy except never gets confused by overlap. Let this be the | |
| 438 first function defined in this file, or change emacs.c where the | |
| 439 address of this function is used. */ | |
| 314 | 440 |
| 441 void | |
| 442 safe_bcopy (from, to, size) | |
|
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
443 const char *from; |
|
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
444 char *to; |
| 314 | 445 int size; |
| 446 { | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
447 if (size <= 0 || from == to) |
| 314 | 448 return; |
| 449 | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
450 /* 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
|
451 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
|
452 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
|
453 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
|
454 bcopy (from, to, size); |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
455 |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
456 /* 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
|
457 else |
| 314 | 458 { |
|
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
459 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
|
460 register char *endt = to + size; |
| 314 | 461 |
| 462 /* If TO - FROM is large, then we should break the copy into | |
| 463 nonoverlapping chunks of TO - FROM bytes each. However, if | |
| 464 TO - FROM is small, then the bcopy function call overhead | |
| 465 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
|
466 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
|
467 bad, I'm trying to err in its favor. */ |
| 314 | 468 if (to - from < 64) |
| 469 { | |
| 470 do | |
| 471 *--endt = *--endf; | |
| 472 while (endf != from); | |
| 473 } | |
| 474 else | |
| 475 { | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
476 for (;;) |
| 314 | 477 { |
| 478 endt -= (to - from); | |
| 479 endf -= (to - from); | |
| 480 | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
481 if (endt < to) |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
482 break; |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
483 |
| 314 | 484 bcopy (endf, endt, to - from); |
| 485 } | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
486 |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
487 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
| 25012 | 488 little left over. The amount left over is (endt + (to - |
| 489 from)) - to, which is endt - from. */ | |
| 314 | 490 bcopy (from, to, endt - from); |
| 491 } | |
| 492 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
493 } |
| 314 | 494 |
| 25012 | 495 |
| 496 | |
| 497 /*********************************************************************** | |
| 498 Glyph Matrices | |
| 499 ***********************************************************************/ | |
| 500 | |
| 501 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
| 502 pool from which memory for the matrix should be allocated, or null | |
| 503 for window-based redisplay where no glyph pools are used. The | |
| 504 member `pool' of the glyph matrix structure returned is set to | |
| 505 POOL, the structure is otherwise zeroed. */ | |
| 506 | |
| 507 struct glyph_matrix * | |
| 508 new_glyph_matrix (pool) | |
| 509 struct glyph_pool *pool; | |
| 510 { | |
| 511 struct glyph_matrix *result; | |
| 512 | |
| 513 /* Allocate and clear. */ | |
| 514 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
| 515 bzero (result, sizeof *result); | |
| 516 | |
| 517 /* Increment number of allocated matrices. This count is used | |
| 518 to detect memory leaks. */ | |
| 519 ++glyph_matrix_count; | |
| 520 | |
| 521 /* Set pool and return. */ | |
| 522 result->pool = pool; | |
| 523 return result; | |
| 524 } | |
| 525 | |
| 526 | |
| 527 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
| 528 | |
| 529 The global counter glyph_matrix_count is decremented when a matrix | |
| 530 is freed. If the count gets negative, more structures were freed | |
| 531 than allocated, i.e. one matrix was freed more than once or a bogus | |
| 532 pointer was passed to this function. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
533 |
| 25012 | 534 If MATRIX->pool is null, this means that the matrix manages its own |
| 535 glyph memory---this is done for matrices on X frames. Freeing the | |
| 536 matrix also frees the glyph memory in this case. */ | |
| 537 | |
| 538 static void | |
| 539 free_glyph_matrix (matrix) | |
| 540 struct glyph_matrix *matrix; | |
| 541 { | |
| 542 if (matrix) | |
| 543 { | |
| 544 int i; | |
| 545 | |
| 546 /* Detect the case that more matrices are freed than were | |
| 547 allocated. */ | |
| 548 if (--glyph_matrix_count < 0) | |
| 549 abort (); | |
| 550 | |
| 551 /* Free glyph memory if MATRIX owns it. */ | |
| 552 if (matrix->pool == NULL) | |
| 553 for (i = 0; i < matrix->rows_allocated; ++i) | |
| 554 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
555 |
| 25012 | 556 /* Free row structures and the matrix itself. */ |
| 557 xfree (matrix->rows); | |
| 558 xfree (matrix); | |
| 559 } | |
| 560 } | |
| 561 | |
| 562 | |
| 563 /* Return the number of glyphs to reserve for a marginal area of | |
| 564 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
| 565 display line of window W. MARGIN gives the width of the marginal | |
| 566 area in canonical character units. MARGIN should be an integer | |
| 567 or a float. */ | |
| 568 | |
| 569 static int | |
| 570 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
| 571 struct window *w; | |
| 572 int total_glyphs; | |
| 573 Lisp_Object margin; | |
| 574 { | |
| 575 int n; | |
| 576 | |
| 577 if (NUMBERP (margin)) | |
| 578 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
579 int width = XFASTINT (w->total_cols); |
| 25012 | 580 double d = max (0, XFLOATINT (margin)); |
| 581 d = min (width / 2 - 1, d); | |
| 582 n = (int) ((double) total_glyphs / width * d); | |
| 583 } | |
| 584 else | |
| 585 n = 0; | |
| 586 | |
| 587 return n; | |
| 588 } | |
| 589 | |
| 590 | |
| 591 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
| 592 window sizes. | |
| 593 | |
| 594 W is null if the function is called for a frame glyph matrix. | |
| 595 Otherwise it is the window MATRIX is a member of. X and Y are the | |
| 596 indices of the first column and row of MATRIX within the frame | |
| 597 matrix, if such a matrix exists. They are zero for purely | |
| 598 window-based redisplay. DIM is the needed size of the matrix. | |
| 599 | |
| 600 In window-based redisplay, where no frame matrices exist, glyph | |
| 601 matrices manage their own glyph storage. Otherwise, they allocate | |
| 602 storage from a common frame glyph pool which can be found in | |
| 603 MATRIX->pool. | |
| 604 | |
| 605 The reason for this memory management strategy is to avoid complete | |
| 606 frame redraws if possible. When we allocate from a common pool, a | |
| 607 change of the location or size of a sub-matrix within the pool | |
| 608 requires a complete redisplay of the frame because we cannot easily | |
| 609 make sure that the current matrices of all windows still agree with | |
| 610 what is displayed on the screen. While this is usually fast, it | |
| 611 leads to screen flickering. */ | |
| 612 | |
| 613 static void | |
| 614 adjust_glyph_matrix (w, matrix, x, y, dim) | |
| 615 struct window *w; | |
| 616 struct glyph_matrix *matrix; | |
| 617 int x, y; | |
| 618 struct dim dim; | |
| 619 { | |
| 620 int i; | |
| 621 int new_rows; | |
| 622 int marginal_areas_changed_p = 0; | |
| 25546 | 623 int header_line_changed_p = 0; |
| 624 int header_line_p = 0; | |
| 25012 | 625 int left = -1, right = -1; |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
626 int window_width = -1, window_height; |
| 25012 | 627 |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
628 /* 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
|
629 Get W's size. */ |
| 25012 | 630 if (w) |
| 631 { | |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
632 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
|
633 |
| 25546 | 634 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
| 635 header_line_changed_p = header_line_p != matrix->header_line_p; | |
| 25012 | 636 } |
| 25546 | 637 matrix->header_line_p = header_line_p; |
| 25012 | 638 |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
639 /* 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
|
640 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
| 25012 | 641 haven't changed. This optimization is important because preserving |
| 642 the matrix means preventing redisplay. */ | |
| 643 if (matrix->pool == NULL) | |
| 644 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
645 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
|
646 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
| 25012 | 647 xassert (left >= 0 && right >= 0); |
| 648 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
| 649 || right != matrix->right_margin_glyphs); | |
| 650 | |
| 651 if (!marginal_areas_changed_p | |
| 652 && !fonts_changed_p | |
| 25546 | 653 && !header_line_changed_p |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
654 && 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
|
655 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
| 25012 | 656 && matrix->window_height == window_height |
| 657 && matrix->window_vscroll == w->vscroll | |
| 658 && matrix->window_width == window_width) | |
| 659 return; | |
| 660 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
661 |
| 25012 | 662 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
| 663 if (matrix->rows_allocated < dim.height) | |
| 664 { | |
| 665 int size = dim.height * sizeof (struct glyph_row); | |
| 666 new_rows = dim.height - matrix->rows_allocated; | |
| 667 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
| 668 bzero (matrix->rows + matrix->rows_allocated, | |
| 669 new_rows * sizeof *matrix->rows); | |
| 670 matrix->rows_allocated = dim.height; | |
| 671 } | |
| 672 else | |
| 673 new_rows = 0; | |
| 674 | |
| 675 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
| 676 on a frame not using window-based redisplay. Set up pointers for | |
| 677 each row into the glyph pool. */ | |
| 678 if (matrix->pool) | |
| 679 { | |
| 680 xassert (matrix->pool->glyphs); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
681 |
| 25012 | 682 if (w) |
| 683 { | |
| 684 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
|
685 w->left_margin_cols); |
| 25012 | 686 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
|
687 w->right_margin_cols); |
| 25012 | 688 } |
| 689 else | |
| 690 left = right = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
691 |
| 25012 | 692 for (i = 0; i < dim.height; ++i) |
| 693 { | |
| 694 struct glyph_row *row = &matrix->rows[i]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
695 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
696 row->glyphs[LEFT_MARGIN_AREA] |
| 25012 | 697 = (matrix->pool->glyphs |
| 698 + (y + i) * matrix->pool->ncolumns | |
| 699 + x); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
700 |
| 25012 | 701 if (w == NULL |
| 702 || row == matrix->rows + dim.height - 1 | |
| 25546 | 703 || (row == matrix->rows && matrix->header_line_p)) |
| 25012 | 704 { |
| 705 row->glyphs[TEXT_AREA] | |
| 706 = row->glyphs[LEFT_MARGIN_AREA]; | |
| 707 row->glyphs[RIGHT_MARGIN_AREA] | |
| 708 = row->glyphs[TEXT_AREA] + dim.width; | |
| 709 row->glyphs[LAST_AREA] | |
| 710 = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 711 } | |
| 712 else | |
| 713 { | |
| 714 row->glyphs[TEXT_AREA] | |
| 715 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
| 716 row->glyphs[RIGHT_MARGIN_AREA] | |
| 717 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
| 718 row->glyphs[LAST_AREA] | |
| 719 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
| 720 } | |
| 721 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
722 |
| 25012 | 723 matrix->left_margin_glyphs = left; |
| 724 matrix->right_margin_glyphs = right; | |
| 725 } | |
| 726 else | |
| 727 { | |
| 728 /* 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
|
729 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
|
730 Allocate glyph memory from the heap. */ |
| 25012 | 731 if (dim.width > matrix->matrix_w |
| 732 || new_rows | |
| 25546 | 733 || header_line_changed_p |
| 25012 | 734 || marginal_areas_changed_p) |
| 735 { | |
| 736 struct glyph_row *row = matrix->rows; | |
| 737 struct glyph_row *end = row + matrix->rows_allocated; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
738 |
| 25012 | 739 while (row < end) |
| 740 { | |
| 741 row->glyphs[LEFT_MARGIN_AREA] | |
| 742 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
| 743 (dim.width | |
| 744 * sizeof (struct glyph))); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
745 |
| 25012 | 746 /* The mode line never has marginal areas. */ |
| 747 if (row == matrix->rows + dim.height - 1 | |
| 25546 | 748 || (row == matrix->rows && matrix->header_line_p)) |
| 25012 | 749 { |
| 750 row->glyphs[TEXT_AREA] | |
| 751 = row->glyphs[LEFT_MARGIN_AREA]; | |
| 752 row->glyphs[RIGHT_MARGIN_AREA] | |
| 753 = row->glyphs[TEXT_AREA] + dim.width; | |
| 754 row->glyphs[LAST_AREA] | |
| 755 = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 756 } | |
| 757 else | |
| 758 { | |
| 759 row->glyphs[TEXT_AREA] | |
| 760 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
| 761 row->glyphs[RIGHT_MARGIN_AREA] | |
| 762 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
| 763 row->glyphs[LAST_AREA] | |
| 764 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
| 765 } | |
| 766 ++row; | |
| 767 } | |
| 768 } | |
| 769 | |
| 770 xassert (left >= 0 && right >= 0); | |
| 771 matrix->left_margin_glyphs = left; | |
| 772 matrix->right_margin_glyphs = right; | |
| 773 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
774 |
| 25012 | 775 /* Number of rows to be used by MATRIX. */ |
| 776 matrix->nrows = dim.height; | |
|
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
777 xassert (matrix->nrows >= 0); |
| 25012 | 778 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
779 if (w) |
| 25012 | 780 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
781 if (matrix == w->current_matrix) |
| 25012 | 782 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
783 /* 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
|
784 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
|
785 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
|
786 building desired matrices when this function runs. */ |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
787 if (window_width < 0) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
788 window_width = window_box_width (w, -1); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
789 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
790 /* 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
|
791 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
|
792 of the window. */ |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
793 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
|
794 && !header_line_changed_p |
|
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
795 && new_rows == 0 |
|
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
796 && dim.width == matrix->matrix_w |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
797 && 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
|
798 && 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
|
799 && matrix->window_width == window_width) |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 { |
|
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
801 /* Find the last row in the window. */ |
|
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
802 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
|
803 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
|
804 { |
|
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
805 ++i; |
|
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
806 break; |
|
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
807 } |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
808 |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
809 /* 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
|
810 are invalidated below. */ |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
811 if (INTEGERP (w->window_end_vpos) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
812 && XFASTINT (w->window_end_vpos) >= i) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
813 w->window_end_valid = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
814 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
815 while (i < matrix->nrows) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
816 matrix->rows[i++].enabled_p = 0; |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
817 } |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
818 else |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
819 { |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
820 for (i = 0; i < matrix->nrows; ++i) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
821 matrix->rows[i].enabled_p = 0; |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
822 } |
| 25012 | 823 } |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
824 else if (matrix == w->desired_matrix) |
| 25012 | 825 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
826 /* 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
|
827 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
|
828 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
|
829 redisplays. */ |
| 25012 | 830 for (i = 0; i < matrix->nrows; ++i) |
| 831 matrix->rows[i].enabled_p = 0; | |
| 832 } | |
| 833 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
834 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
835 |
| 25012 | 836 /* Remember last values to be able to optimize frame redraws. */ |
| 837 matrix->matrix_x = x; | |
| 838 matrix->matrix_y = y; | |
| 839 matrix->matrix_w = dim.width; | |
| 840 matrix->matrix_h = dim.height; | |
| 841 | |
| 842 /* Record the top y location and height of W at the time the matrix | |
| 843 was last adjusted. This is used to optimize redisplay above. */ | |
| 844 if (w) | |
| 845 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
846 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
|
847 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
| 25012 | 848 matrix->window_height = window_height; |
| 849 matrix->window_width = window_width; | |
| 850 matrix->window_vscroll = w->vscroll; | |
| 851 } | |
| 852 } | |
| 853 | |
| 854 | |
| 855 /* Reverse the contents of rows in MATRIX between START and END. The | |
| 856 contents of the row at END - 1 end up at START, END - 2 at START + | |
| 857 1 etc. This is part of the implementation of rotate_matrix (see | |
| 858 below). */ | |
| 314 | 859 |
| 860 static void | |
| 25012 | 861 reverse_rows (matrix, start, end) |
| 862 struct glyph_matrix *matrix; | |
| 863 int start, end; | |
| 314 | 864 { |
| 25012 | 865 int i, j; |
| 866 | |
| 867 for (i = start, j = end - 1; i < j; ++i, --j) | |
| 868 { | |
| 869 /* Non-ISO HP/UX compiler doesn't like auto struct | |
| 870 initialization. */ | |
| 871 struct glyph_row temp; | |
| 872 temp = matrix->rows[i]; | |
| 873 matrix->rows[i] = matrix->rows[j]; | |
| 874 matrix->rows[j] = temp; | |
| 875 } | |
| 314 | 876 } |
| 877 | |
| 25012 | 878 |
| 879 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
| 880 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
| 881 indices. (Note: this does not copy glyphs, only glyph pointers in | |
| 882 row structures are moved around). | |
| 883 | |
| 884 The algorithm used for rotating the vector was, I believe, first | |
| 885 described by Kernighan. See the vector R as consisting of two | |
| 886 sub-vectors AB, where A has length BY for BY >= 0. The result | |
| 887 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
| 888 and reverse the result to get (ArBr)r which is BA. Similar for | |
| 889 rotating right. */ | |
| 890 | |
| 891 void | |
| 892 rotate_matrix (matrix, first, last, by) | |
| 893 struct glyph_matrix *matrix; | |
| 894 int first, last, by; | |
| 314 | 895 { |
| 25012 | 896 if (by < 0) |
| 897 { | |
| 898 /* Up (rotate left, i.e. towards lower indices). */ | |
| 899 by = -by; | |
| 900 reverse_rows (matrix, first, first + by); | |
| 901 reverse_rows (matrix, first + by, last); | |
| 902 reverse_rows (matrix, first, last); | |
| 903 } | |
| 904 else if (by > 0) | |
| 314 | 905 { |
| 25012 | 906 /* Down (rotate right, i.e. towards higher indices). */ |
| 907 reverse_rows (matrix, last - by, last); | |
| 908 reverse_rows (matrix, first, last - by); | |
| 909 reverse_rows (matrix, first, last); | |
| 314 | 910 } |
| 25012 | 911 } |
| 912 | |
| 913 | |
| 914 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
| 915 with indices START <= index < END. Increment positions by DELTA/ | |
| 916 DELTA_BYTES. */ | |
| 917 | |
| 918 void | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
919 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
| 25012 | 920 struct glyph_matrix *matrix; |
| 921 int start, end, delta, delta_bytes; | |
| 922 { | |
| 923 /* Check that START and END are reasonable values. */ | |
| 924 xassert (start >= 0 && start <= matrix->nrows); | |
| 925 xassert (end >= 0 && end <= matrix->nrows); | |
| 926 xassert (start <= end); | |
| 927 | |
| 928 for (; start < end; ++start) | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
929 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
| 25012 | 930 } |
| 931 | |
| 932 | |
| 933 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
| 934 the row indices of the first and last + 1 row to enable. If | |
| 935 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
| 936 | |
| 937 void | |
| 938 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
| 939 struct glyph_matrix *matrix; | |
| 940 int start, end; | |
| 941 int enabled_p; | |
| 942 { | |
|
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
943 xassert (start <= end); |
|
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
944 xassert (start >= 0 && start < matrix->nrows); |
|
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
945 xassert (end >= 0 && end <= matrix->nrows); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
946 |
| 25012 | 947 for (; start < end; ++start) |
| 948 matrix->rows[start].enabled_p = enabled_p != 0; | |
| 949 } | |
| 950 | |
| 951 | |
| 952 /* Clear MATRIX. | |
| 953 | |
| 954 This empties all rows in MATRIX by setting the enabled_p flag for | |
| 955 all rows of the matrix to zero. The function prepare_desired_row | |
| 956 will eventually really clear a row when it sees one with a zero | |
| 957 enabled_p flag. | |
| 958 | |
| 959 Resets update hints to defaults value. The only update hint | |
| 960 currently present is the flag MATRIX->no_scrolling_p. */ | |
| 961 | |
| 962 void | |
| 963 clear_glyph_matrix (matrix) | |
| 964 struct glyph_matrix *matrix; | |
| 965 { | |
| 966 if (matrix) | |
| 314 | 967 { |
| 25012 | 968 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
| 969 matrix->no_scrolling_p = 0; | |
| 314 | 970 } |
| 971 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
972 |
| 25012 | 973 |
| 974 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
| 975 Increment y-positions in glyph rows between START and END by DY, | |
| 976 and recompute their visible height. */ | |
| 977 | |
| 978 void | |
| 979 shift_glyph_matrix (w, matrix, start, end, dy) | |
| 980 struct window *w; | |
| 981 struct glyph_matrix *matrix; | |
| 982 int start, end, dy; | |
| 983 { | |
| 984 int min_y, max_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
985 |
| 25012 | 986 xassert (start <= end); |
| 987 xassert (start >= 0 && start < matrix->nrows); | |
| 988 xassert (end >= 0 && end <= matrix->nrows); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
989 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
990 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
|
991 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
992 |
| 25012 | 993 for (; start < end; ++start) |
| 994 { | |
| 995 struct glyph_row *row = &matrix->rows[start]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
996 |
| 25012 | 997 row->y += dy; |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
998 row->visible_height = row->height; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
999 |
| 25012 | 1000 if (row->y < min_y) |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1001 row->visible_height -= min_y - row->y; |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1002 if (row->y + row->height > max_y) |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1003 row->visible_height -= row->y + row->height - max_y; |
| 25012 | 1004 } |
| 1005 } | |
| 1006 | |
| 1007 | |
| 1008 /* Mark all rows in current matrices of frame F as invalid. Marking | |
| 1009 invalid is done by setting enabled_p to zero for all rows in a | |
| 1010 current matrix. */ | |
| 1011 | |
| 1012 void | |
| 1013 clear_current_matrices (f) | |
| 1014 register struct frame *f; | |
| 1015 { | |
| 1016 /* Clear frame current matrix, if we have one. */ | |
| 1017 if (f->current_matrix) | |
| 1018 clear_glyph_matrix (f->current_matrix); | |
| 1019 | |
| 1020 /* Clear the matrix of the menu bar window, if such a window exists. | |
| 1021 The menu bar window is currently used to display menus on X when | |
| 1022 no toolkit support is compiled in. */ | |
| 1023 if (WINDOWP (f->menu_bar_window)) | |
| 1024 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
| 1025 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1026 /* 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
|
1027 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
|
1028 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
| 25012 | 1029 |
| 1030 /* Clear current window matrices. */ | |
| 1031 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
| 1032 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
| 1033 } | |
| 1034 | |
| 1035 | |
| 1036 /* Clear out all display lines of F for a coming redisplay. */ | |
| 314 | 1037 |
| 21514 | 1038 void |
| 25012 | 1039 clear_desired_matrices (f) |
| 1040 register struct frame *f; | |
| 314 | 1041 { |
| 25012 | 1042 if (f->desired_matrix) |
| 1043 clear_glyph_matrix (f->desired_matrix); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1044 |
| 25012 | 1045 if (WINDOWP (f->menu_bar_window)) |
| 1046 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
| 1047 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1048 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
|
1049 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
| 25012 | 1050 |
| 1051 /* Do it for window matrices. */ | |
| 1052 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
| 1053 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
| 1054 } | |
| 1055 | |
| 1056 | |
| 1057 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
| 1058 non-zero clear desired matrices, otherwise clear current matrices. */ | |
| 1059 | |
| 1060 static void | |
| 1061 clear_window_matrices (w, desired_p) | |
| 1062 struct window *w; | |
| 1063 int desired_p; | |
| 1064 { | |
| 1065 while (w) | |
| 314 | 1066 { |
| 25012 | 1067 if (!NILP (w->hchild)) |
| 1068 { | |
| 1069 xassert (WINDOWP (w->hchild)); | |
| 1070 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
| 1071 } | |
| 1072 else if (!NILP (w->vchild)) | |
| 314 | 1073 { |
| 25012 | 1074 xassert (WINDOWP (w->vchild)); |
| 1075 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
| 1076 } | |
| 1077 else | |
| 1078 { | |
| 1079 if (desired_p) | |
| 1080 clear_glyph_matrix (w->desired_matrix); | |
| 1081 else | |
| 314 | 1082 { |
| 25012 | 1083 clear_glyph_matrix (w->current_matrix); |
| 1084 w->window_end_valid = Qnil; | |
| 314 | 1085 } |
| 25012 | 1086 } |
| 1087 | |
| 1088 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 1089 } | |
| 1090 } | |
| 1091 | |
| 1092 | |
| 1093 | |
| 1094 /*********************************************************************** | |
| 1095 Glyph Rows | |
| 1096 | |
| 1097 See dispextern.h for an overall explanation of glyph rows. | |
| 1098 ***********************************************************************/ | |
| 1099 | |
| 1100 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
| 1101 changes in the glyph_row structure, i.e. addition or removal of | |
| 1102 structure members. */ | |
| 1103 | |
|
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1104 static struct glyph_row null_row; |
|
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1105 |
| 25012 | 1106 void |
| 1107 clear_glyph_row (row) | |
| 1108 struct glyph_row *row; | |
| 1109 { | |
| 1110 struct glyph *p[1 + LAST_AREA]; | |
| 1111 | |
| 1112 /* Save pointers. */ | |
| 1113 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
| 1114 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
| 1115 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 1116 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
| 1117 | |
| 1118 /* Clear. */ | |
| 1119 *row = null_row; | |
| 1120 | |
| 1121 /* Restore pointers. */ | |
| 1122 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
| 1123 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
| 1124 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
| 1125 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
|
1126 |
|
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1127 #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
|
1128 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
|
1129 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
|
1130 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
|
1131 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
|
1132 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
|
1133 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
|
1134 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
|
1135 #endif |
| 25012 | 1136 } |
| 1137 | |
| 1138 | |
| 1139 /* Make ROW an empty, enabled row of canonical character height, | |
| 1140 in window W starting at y-position Y. */ | |
| 1141 | |
| 1142 void | |
| 1143 blank_row (w, row, y) | |
| 1144 struct window *w; | |
| 1145 struct glyph_row *row; | |
| 1146 int y; | |
| 1147 { | |
| 1148 int min_y, max_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1149 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1150 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
|
1151 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1152 |
| 25012 | 1153 clear_glyph_row (row); |
| 1154 row->y = y; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1155 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
|
1156 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
|
1157 row->visible_height = row->height; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1158 |
| 25012 | 1159 if (row->y < min_y) |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1160 row->visible_height -= min_y - row->y; |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1161 if (row->y + row->height > max_y) |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1162 row->visible_height -= row->y + row->height - max_y; |
| 25012 | 1163 |
| 1164 row->enabled_p = 1; | |
| 1165 } | |
| 1166 | |
| 1167 | |
| 1168 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
| 1169 are the amounts by which to change positions. Note that the first | |
| 1170 glyph of the text area of a row can have a buffer position even if | |
| 1171 the used count of the text area is zero. Such rows display line | |
| 1172 ends. */ | |
| 1173 | |
| 1174 void | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1175 increment_row_positions (row, delta, delta_bytes) |
| 25012 | 1176 struct glyph_row *row; |
| 1177 int delta, delta_bytes; | |
| 1178 { | |
| 1179 int area, i; | |
| 1180 | |
| 1181 /* Increment start and end positions. */ | |
| 1182 MATRIX_ROW_START_CHARPOS (row) += delta; | |
| 1183 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
| 1184 MATRIX_ROW_END_CHARPOS (row) += delta; | |
| 1185 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
| 1186 | |
| 1187 /* Increment positions in glyphs. */ | |
| 1188 for (area = 0; area < LAST_AREA; ++area) | |
| 1189 for (i = 0; i < row->used[area]; ++i) | |
| 1190 if (BUFFERP (row->glyphs[area][i].object) | |
| 1191 && row->glyphs[area][i].charpos > 0) | |
| 1192 row->glyphs[area][i].charpos += delta; | |
| 1193 | |
| 1194 /* Capture the case of rows displaying a line end. */ | |
| 1195 if (row->used[TEXT_AREA] == 0 | |
| 1196 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
| 1197 row->glyphs[TEXT_AREA]->charpos += delta; | |
| 1198 } | |
| 1199 | |
| 1200 | |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1201 #if 0 |
| 25012 | 1202 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
| 1203 contents, i.e. glyph structure contents are exchanged between A and | |
| 1204 B without changing glyph pointers in A and B. */ | |
| 1205 | |
| 1206 static void | |
| 1207 swap_glyphs_in_rows (a, b) | |
| 1208 struct glyph_row *a, *b; | |
| 1209 { | |
| 1210 int area; | |
| 1211 | |
| 1212 for (area = 0; area < LAST_AREA; ++area) | |
| 1213 { | |
| 1214 /* Number of glyphs to swap. */ | |
| 1215 int max_used = max (a->used[area], b->used[area]); | |
| 1216 | |
| 1217 /* Start of glyphs in area of row A. */ | |
| 1218 struct glyph *glyph_a = a->glyphs[area]; | |
| 1219 | |
| 1220 /* End + 1 of glyphs in area of row A. */ | |
| 1221 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
| 1222 | |
| 1223 /* Start of glyphs in area of row B. */ | |
| 1224 struct glyph *glyph_b = b->glyphs[area]; | |
| 1225 | |
| 1226 while (glyph_a < glyph_a_end) | |
| 1227 { | |
| 1228 /* Non-ISO HP/UX compiler doesn't like auto struct | |
| 1229 initialization. */ | |
| 1230 struct glyph temp; | |
| 1231 temp = *glyph_a; | |
| 1232 *glyph_a = *glyph_b; | |
| 1233 *glyph_b = temp; | |
| 1234 ++glyph_a; | |
| 1235 ++glyph_b; | |
| 314 | 1236 } |
| 1237 } | |
| 1238 } | |
| 25012 | 1239 |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1240 #endif /* 0 */ |
| 25012 | 1241 |
| 1242 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
| 1243 | |
| 1244 static INLINE void | |
| 1245 swap_glyph_pointers (a, b) | |
| 1246 struct glyph_row *a, *b; | |
| 1247 { | |
| 1248 int i; | |
| 1249 for (i = 0; i < LAST_AREA + 1; ++i) | |
| 1250 { | |
| 1251 struct glyph *temp = a->glyphs[i]; | |
| 1252 a->glyphs[i] = b->glyphs[i]; | |
| 1253 b->glyphs[i] = temp; | |
| 1254 } | |
| 1255 } | |
| 1256 | |
| 1257 | |
| 1258 /* Copy glyph row structure FROM to glyph row structure TO, except | |
| 1259 that glyph pointers in the structures are left unchanged. */ | |
| 1260 | |
| 1261 INLINE void | |
| 1262 copy_row_except_pointers (to, from) | |
| 1263 struct glyph_row *to, *from; | |
| 1264 { | |
| 1265 struct glyph *pointers[1 + LAST_AREA]; | |
| 1266 | |
| 1267 /* Save glyph pointers of TO. */ | |
| 1268 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
| 1269 | |
| 1270 /* Do a structure assignment. */ | |
| 1271 *to = *from; | |
| 1272 | |
| 1273 /* Restore original pointers of TO. */ | |
| 1274 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
| 1275 } | |
| 1276 | |
| 1277 | |
| 1278 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
| 1279 TO and FROM are left unchanged. Glyph contents are copied from the | |
| 1280 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
| 1281 positions in row TO by DELTA/ DELTA_BYTES. */ | |
| 1282 | |
| 1283 void | |
| 1284 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
| 1285 struct glyph_row *to, *from; | |
| 1286 int delta, delta_bytes; | |
| 1287 { | |
| 1288 int area; | |
| 1289 | |
| 1290 /* This is like a structure assignment TO = FROM, except that | |
| 1291 glyph pointers in the rows are left unchanged. */ | |
| 1292 copy_row_except_pointers (to, from); | |
| 1293 | |
| 1294 /* Copy glyphs from FROM to TO. */ | |
| 1295 for (area = 0; area < LAST_AREA; ++area) | |
| 1296 if (from->used[area]) | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1297 bcopy (from->glyphs[area], to->glyphs[area], |
| 25012 | 1298 from->used[area] * sizeof (struct glyph)); |
| 1299 | |
| 1300 /* Increment buffer positions in TO by DELTA. */ | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1301 increment_row_positions (to, delta, delta_bytes); |
| 25012 | 1302 } |
| 1303 | |
| 1304 | |
| 1305 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
| 1306 assignment TO = FROM, except that glyph pointers are not copied but | |
| 1307 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
| 1308 a memory leak. */ | |
| 1309 | |
| 1310 static INLINE void | |
| 1311 assign_row (to, from) | |
| 1312 struct glyph_row *to, *from; | |
| 1313 { | |
| 1314 swap_glyph_pointers (to, from); | |
| 1315 copy_row_except_pointers (to, from); | |
| 1316 } | |
| 1317 | |
| 1318 | |
| 1319 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
| 1320 a row in a window matrix, is a slice of the glyph memory of the | |
| 1321 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
| 1322 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
| 1323 memory of FRAME_ROW. */ | |
| 1324 | |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1325 #if GLYPH_DEBUG |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1326 |
| 25012 | 1327 static int |
| 1328 glyph_row_slice_p (window_row, frame_row) | |
| 1329 struct glyph_row *window_row, *frame_row; | |
| 1330 { | |
| 1331 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
| 1332 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
| 1333 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
| 1334 | |
| 1335 return (frame_glyph_start <= window_glyph_start | |
| 1336 && window_glyph_start < frame_glyph_end); | |
| 1337 } | |
| 1338 | |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1339 #endif /* GLYPH_DEBUG */ |
| 25012 | 1340 |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1341 #if 0 |
|
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1342 |
| 25012 | 1343 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
| 1344 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
| 1345 in WINDOW_MATRIX is found satisfying the condition. */ | |
| 1346 | |
| 1347 static struct glyph_row * | |
| 1348 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
| 1349 struct glyph_matrix *window_matrix, *frame_matrix; | |
| 1350 int row; | |
| 1351 { | |
| 1352 int i; | |
| 1353 | |
| 1354 xassert (row >= 0 && row < frame_matrix->nrows); | |
| 1355 | |
| 1356 for (i = 0; i < window_matrix->nrows; ++i) | |
| 1357 if (glyph_row_slice_p (window_matrix->rows + i, | |
| 1358 frame_matrix->rows + row)) | |
| 1359 break; | |
| 1360 | |
| 1361 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
| 1362 } | |
| 1363 | |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1364 #endif /* 0 */ |
| 25012 | 1365 |
| 1366 /* Prepare ROW for display. Desired rows are cleared lazily, | |
| 1367 i.e. they are only marked as to be cleared by setting their | |
| 1368 enabled_p flag to zero. When a row is to be displayed, a prior | |
| 1369 call to this function really clears it. */ | |
| 1370 | |
| 1371 void | |
| 1372 prepare_desired_row (row) | |
| 1373 struct glyph_row *row; | |
| 1374 { | |
| 1375 if (!row->enabled_p) | |
| 1376 { | |
| 1377 clear_glyph_row (row); | |
| 1378 row->enabled_p = 1; | |
| 1379 } | |
| 1380 } | |
| 1381 | |
| 1382 | |
| 1383 /* Return a hash code for glyph row ROW. */ | |
| 1384 | |
| 1385 int | |
| 1386 line_hash_code (row) | |
| 1387 struct glyph_row *row; | |
| 1388 { | |
| 1389 int hash = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1390 |
| 25012 | 1391 if (row->enabled_p) |
| 1392 { | |
|
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1393 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
|
1394 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
|
1395 |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1396 while (glyph < end) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1397 { |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1398 int c = glyph->u.ch; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1399 int face_id = glyph->face_id; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1400 if (must_write_spaces) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1401 c -= SPACEGLYPH; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1402 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
|
1403 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
|
1404 ++glyph; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1405 } |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1406 |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1407 if (hash == 0) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1408 hash = 1; |
| 25012 | 1409 } |
| 1410 | |
| 1411 return hash; | |
| 1412 } | |
| 1413 | |
| 1414 | |
|
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
|
1415 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
| 25012 | 1416 the number of characters in the line. If must_write_spaces is |
| 1417 zero, leading and trailing spaces are ignored. */ | |
| 1418 | |
| 1419 static unsigned int | |
| 1420 line_draw_cost (matrix, vpos) | |
| 1421 struct glyph_matrix *matrix; | |
| 1422 int vpos; | |
| 1423 { | |
| 1424 struct glyph_row *row = matrix->rows + vpos; | |
| 1425 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
| 1426 struct glyph *end = beg + row->used[TEXT_AREA]; | |
| 1427 int len; | |
| 1428 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
| 1429 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
| 1430 | |
| 1431 /* Ignore trailing and leading spaces if we can. */ | |
| 1432 if (!must_write_spaces) | |
| 1433 { | |
| 1434 /* 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
|
1435 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
| 25012 | 1436 --end; |
| 1437 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1438 /* All blank line. */ |
| 25012 | 1439 if (end == beg) |
| 1440 return 0; | |
| 1441 | |
| 1442 /* Skip over leading spaces. */ | |
| 1443 while (CHAR_GLYPH_SPACE_P (*beg)) | |
| 1444 ++beg; | |
| 1445 } | |
| 1446 | |
| 1447 /* If we don't have a glyph-table, each glyph is one character, | |
| 1448 so return the number of glyphs. */ | |
| 1449 if (glyph_table_base == 0) | |
| 1450 len = end - beg; | |
| 1451 else | |
| 1452 { | |
| 1453 /* Otherwise, scan the glyphs and accumulate their total length | |
| 1454 in LEN. */ | |
| 1455 len = 0; | |
| 1456 while (beg < end) | |
| 1457 { | |
| 1458 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1459 |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1460 if (g < 0 |
|
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1461 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
| 25012 | 1462 len += 1; |
| 1463 else | |
| 1464 len += GLYPH_LENGTH (glyph_table_base, g); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1465 |
| 25012 | 1466 ++beg; |
| 1467 } | |
| 1468 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1469 |
| 25012 | 1470 return len; |
| 1471 } | |
| 1472 | |
| 1473 | |
| 1474 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
| 1475 and B have equal contents. W is the window to which the glyphs | |
| 1476 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
|
1477 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
|
1478 flags of A and B, too. */ |
| 25012 | 1479 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1480 static INLINE int |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1481 row_equal_p (w, a, b, mouse_face_p) |
| 25012 | 1482 struct window *w; |
| 1483 struct glyph_row *a, *b; | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1484 int mouse_face_p; |
| 25012 | 1485 { |
| 1486 if (a == b) | |
| 1487 return 1; | |
| 1488 else if (a->hash != b->hash) | |
| 1489 return 0; | |
| 1490 else | |
| 1491 { | |
| 1492 struct glyph *a_glyph, *b_glyph, *a_end; | |
| 1493 int area; | |
| 1494 | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1495 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
|
1496 return 0; |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1497 |
| 25012 | 1498 /* Compare glyphs. */ |
| 1499 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
| 1500 { | |
| 1501 if (a->used[area] != b->used[area]) | |
| 1502 return 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1503 |
| 25012 | 1504 a_glyph = a->glyphs[area]; |
| 1505 a_end = a_glyph + a->used[area]; | |
| 1506 b_glyph = b->glyphs[area]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1507 |
| 25012 | 1508 while (a_glyph < a_end |
| 1509 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
| 1510 ++a_glyph, ++b_glyph; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1511 |
| 25012 | 1512 if (a_glyph != a_end) |
| 1513 return 0; | |
| 1514 } | |
| 1515 | |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1516 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
|
1517 || 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
|
1518 || 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
|
1519 || 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
|
1520 || 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
|
1521 || a->right_fringe_face_id != b->right_fringe_face_id |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1522 || a->overlay_arrow_p != b->overlay_arrow_p |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1523 || 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
|
1524 || a->overlapped_p != b->overlapped_p |
| 25012 | 1525 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
| 1526 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
| 1527 /* Different partially visible characters on left margin. */ | |
| 1528 || a->x != b->x | |
| 1529 /* Different height. */ | |
| 1530 || a->ascent != b->ascent | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1531 || a->phys_ascent != b->phys_ascent |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1532 || a->phys_height != b->phys_height |
| 25012 | 1533 || a->visible_height != b->visible_height) |
| 1534 return 0; | |
| 1535 } | |
| 1536 | |
| 1537 return 1; | |
| 1538 } | |
| 1539 | |
| 1540 | |
| 314 | 1541 |
| 25012 | 1542 /*********************************************************************** |
| 1543 Glyph Pool | |
| 1544 | |
| 1545 See dispextern.h for an overall explanation of glyph pools. | |
| 1546 ***********************************************************************/ | |
| 1547 | |
| 1548 /* Allocate a glyph_pool structure. The structure returned is | |
| 1549 initialized with zeros. The global variable glyph_pool_count is | |
| 1550 incremented for each pool allocated. */ | |
| 1551 | |
| 1552 static struct glyph_pool * | |
| 1553 new_glyph_pool () | |
| 1554 { | |
| 1555 struct glyph_pool *result; | |
| 1556 | |
| 1557 /* Allocate a new glyph_pool and clear it. */ | |
| 1558 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
| 1559 bzero (result, sizeof *result); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1560 |
| 25012 | 1561 /* For memory leak and double deletion checking. */ |
| 1562 ++glyph_pool_count; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1563 |
| 25012 | 1564 return result; |
| 1565 } | |
| 1566 | |
| 1567 | |
| 1568 /* Free a glyph_pool structure POOL. The function may be called with | |
| 1569 a null POOL pointer. The global variable glyph_pool_count is | |
| 1570 decremented with every pool structure freed. If this count gets | |
| 1571 negative, more structures were freed than allocated, i.e. one | |
| 1572 structure must have been freed more than once or a bogus pointer | |
| 1573 was passed to free_glyph_pool. */ | |
| 1574 | |
| 1575 static void | |
| 1576 free_glyph_pool (pool) | |
| 1577 struct glyph_pool *pool; | |
| 1578 { | |
| 1579 if (pool) | |
| 1580 { | |
|
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
|
1581 /* More freed than allocated? */ |
| 25012 | 1582 --glyph_pool_count; |
| 1583 xassert (glyph_pool_count >= 0); | |
| 1584 | |
| 1585 xfree (pool->glyphs); | |
| 1586 xfree (pool); | |
| 1587 } | |
| 1588 } | |
| 1589 | |
| 1590 | |
| 1591 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
| 1592 columns we need. This function never shrinks a pool. The only | |
| 1593 case in which this would make sense, would be when a frame's size | |
| 1594 is changed from a large value to a smaller one. But, if someone | |
| 1595 does it once, we can expect that he will do it again. | |
| 1596 | |
| 1597 Value is non-zero if the pool changed in a way which makes | |
| 1598 re-adjusting window glyph matrices necessary. */ | |
| 1599 | |
| 1600 static int | |
| 1601 realloc_glyph_pool (pool, matrix_dim) | |
| 1602 struct glyph_pool *pool; | |
| 1603 struct dim matrix_dim; | |
| 1604 { | |
| 1605 int needed; | |
| 1606 int changed_p; | |
| 1607 | |
| 1608 changed_p = (pool->glyphs == 0 | |
| 1609 || matrix_dim.height != pool->nrows | |
| 1610 || matrix_dim.width != pool->ncolumns); | |
| 1611 | |
| 1612 /* Enlarge the glyph pool. */ | |
| 1613 needed = matrix_dim.width * matrix_dim.height; | |
| 1614 if (needed > pool->nglyphs) | |
| 1615 { | |
| 1616 int size = needed * sizeof (struct glyph); | |
| 1617 | |
| 1618 if (pool->glyphs) | |
| 1619 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
| 1620 else | |
| 1621 { | |
| 1622 pool->glyphs = (struct glyph *) xmalloc (size); | |
| 1623 bzero (pool->glyphs, size); | |
| 1624 } | |
| 1625 | |
| 1626 pool->nglyphs = needed; | |
| 1627 } | |
| 1628 | |
|
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
|
1629 /* Remember the number of rows and columns because (a) we use them |
| 25012 | 1630 to do sanity checks, and (b) the number of columns determines |
| 1631 where rows in the frame matrix start---this must be available to | |
| 1632 determine pointers to rows of window sub-matrices. */ | |
| 1633 pool->nrows = matrix_dim.height; | |
| 1634 pool->ncolumns = matrix_dim.width; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1635 |
| 25012 | 1636 return changed_p; |
| 1637 } | |
| 1638 | |
| 1639 | |
| 1640 | |
| 1641 /*********************************************************************** | |
| 1642 Debug Code | |
| 1643 ***********************************************************************/ | |
| 1644 | |
| 1645 #if GLYPH_DEBUG | |
| 1646 | |
|
27855
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 /* Flush standard output. This is sometimes useful to call from |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1649 the debugger. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1650 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1651 void |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1652 flush_stdout () |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1653 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1654 fflush (stdout); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1655 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1656 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1657 |
| 25012 | 1658 /* Check that no glyph pointers have been lost in MATRIX. If a |
| 1659 pointer has been lost, e.g. by using a structure assignment between | |
| 1660 rows, at least one pointer must occur more than once in the rows of | |
| 1661 MATRIX. */ | |
| 1662 | |
| 1663 void | |
| 1664 check_matrix_pointer_lossage (matrix) | |
| 1665 struct glyph_matrix *matrix; | |
| 1666 { | |
| 1667 int i, j; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1668 |
| 25012 | 1669 for (i = 0; i < matrix->nrows; ++i) |
| 1670 for (j = 0; j < matrix->nrows; ++j) | |
| 1671 xassert (i == j | |
| 1672 || (matrix->rows[i].glyphs[TEXT_AREA] | |
| 1673 != matrix->rows[j].glyphs[TEXT_AREA])); | |
| 1674 } | |
| 1675 | |
| 1676 | |
| 1677 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
| 1678 | |
| 1679 struct glyph_row * | |
| 1680 matrix_row (matrix, row) | |
| 1681 struct glyph_matrix *matrix; | |
| 1682 int row; | |
| 1683 { | |
| 1684 xassert (matrix && matrix->rows); | |
| 1685 xassert (row >= 0 && row < matrix->nrows); | |
| 1686 | |
| 1687 /* That's really too slow for normal testing because this function | |
| 1688 is called almost everywhere. Although---it's still astonishingly | |
| 1689 fast, so it is valuable to have for debugging purposes. */ | |
| 314 | 1690 #if 0 |
| 25012 | 1691 check_matrix_pointer_lossage (matrix); |
| 1692 #endif | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1693 |
| 25012 | 1694 return matrix->rows + row; |
| 1695 } | |
| 1696 | |
| 1697 | |
| 1698 #if 0 /* This function makes invalid assumptions when text is | |
| 1699 partially invisible. But it might come handy for debugging | |
| 1700 nevertheless. */ | |
| 1701 | |
| 1702 /* Check invariants that must hold for an up to date current matrix of | |
| 1703 window W. */ | |
| 1704 | |
| 1705 static void | |
| 1706 check_matrix_invariants (w) | |
| 314 | 1707 struct window *w; |
| 1708 { | |
| 25012 | 1709 struct glyph_matrix *matrix = w->current_matrix; |
| 1710 int yb = window_text_bottom_y (w); | |
| 1711 struct glyph_row *row = matrix->rows; | |
| 1712 struct glyph_row *last_text_row = NULL; | |
| 1713 struct buffer *saved = current_buffer; | |
| 1714 struct buffer *buffer = XBUFFER (w->buffer); | |
| 1715 int c; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1716 |
| 25012 | 1717 /* This can sometimes happen for a fresh window. */ |
| 1718 if (matrix->nrows < 2) | |
| 1719 return; | |
| 1720 | |
| 1721 set_buffer_temp (buffer); | |
| 1722 | |
| 1723 /* Note: last row is always reserved for the mode line. */ | |
| 1724 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
| 1725 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
| 1726 { | |
| 1727 struct glyph_row *next = row + 1; | |
| 1728 | |
| 1729 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
| 1730 last_text_row = row; | |
| 1731 | |
| 1732 /* Check that character and byte positions are in sync. */ | |
| 1733 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
| 1734 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
| 1735 | |
| 1736 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
| 1737 have such a position temporarily in case of a minibuffer | |
| 1738 displaying something like `[Sole completion]' at its end. */ | |
| 1739 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
| 1740 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
| 1741 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
| 1742 | |
| 1743 /* Check that end position of `row' is equal to start position | |
| 1744 of next row. */ | |
| 1745 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
| 1746 { | |
| 1747 xassert (MATRIX_ROW_END_CHARPOS (row) | |
| 1748 == MATRIX_ROW_START_CHARPOS (next)); | |
| 1749 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
| 1750 == MATRIX_ROW_START_BYTEPOS (next)); | |
| 1751 } | |
| 1752 row = next; | |
| 1753 } | |
| 1754 | |
| 1755 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
| 1756 xassert (w->desired_matrix->rows != NULL); | |
| 1757 set_buffer_temp (saved); | |
| 1758 } | |
| 1759 | |
| 1760 #endif /* 0 */ | |
| 1761 | |
| 1762 #endif /* GLYPH_DEBUG != 0 */ | |
| 1763 | |
| 1764 | |
| 1765 | |
| 1766 /********************************************************************** | |
| 1767 Allocating/ Adjusting Glyph Matrices | |
| 1768 **********************************************************************/ | |
| 1769 | |
| 1770 /* Allocate glyph matrices over a window tree for a frame-based | |
| 1771 redisplay | |
| 1772 | |
| 1773 X and Y are column/row within the frame glyph matrix where | |
| 1774 sub-matrices for the window tree rooted at WINDOW must be | |
| 1775 allocated. CH_DIM contains the dimensions of the smallest | |
| 1776 character that could be used during display. DIM_ONLY_P non-zero | |
| 1777 means that the caller of this function is only interested in the | |
| 1778 result matrix dimension, and matrix adjustments should not be | |
| 1779 performed. | |
| 1780 | |
| 1781 The function returns the total width/height of the sub-matrices of | |
| 1782 the window tree. If called on a frame root window, the computation | |
| 1783 will take the mini-buffer window into account. | |
| 1784 | |
| 1785 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
| 1786 | |
| 1787 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
| 1788 glyph matrices yet, and | |
| 1789 | |
| 1790 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
| 1791 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
|
1792 DIM_ONLY_P) |
| 25012 | 1793 |
| 1794 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
| 1795 function. | |
| 1796 | |
| 1797 Windows are arranged into chains of windows on the same level | |
| 1798 through the next fields of window structures. Such a level can be | |
| 1799 either a sequence of horizontally adjacent windows from left to | |
| 1800 right, or a sequence of vertically adjacent windows from top to | |
| 1801 bottom. Each window in a horizontal sequence can be either a leaf | |
| 1802 window or a vertical sequence; a window in a vertical sequence can | |
| 1803 be either a leaf or a horizontal sequence. All windows in a | |
| 1804 horizontal sequence have the same height, and all windows in a | |
| 1805 vertical sequence have the same width. | |
| 1806 | |
| 1807 This function uses, for historical reasons, a more general | |
| 1808 algorithm to determine glyph matrix dimensions that would be | |
| 1809 necessary. | |
| 1810 | |
| 1811 The matrix height of a horizontal sequence is determined by the | |
| 1812 maximum height of any matrix in the sequence. The matrix width of | |
| 1813 a horizontal sequence is computed by adding up matrix widths of | |
| 1814 windows in the sequence. | |
| 1815 | |
| 1816 |<------- result width ------->| | |
| 1817 +---------+----------+---------+ --- | |
| 1818 | | | | | | |
| 1819 | | | | | |
| 1820 +---------+ | | result height | |
| 1821 | +---------+ | |
| 1822 | | | | |
| 1823 +----------+ --- | |
| 1824 | |
| 1825 The matrix width of a vertical sequence is the maximum matrix width | |
| 1826 of any window in the sequence. Its height is computed by adding up | |
| 1827 matrix heights of windows in the sequence. | |
| 1828 | |
| 1829 |<---- result width -->| | |
| 1830 +---------+ --- | |
| 1831 | | | | |
| 1832 | | | | |
| 1833 +---------+--+ | | |
| 1834 | | | | |
| 1835 | | result height | |
| 1836 | | | |
| 1837 +------------+---------+ | | |
| 1838 | | | | |
| 1839 | | | | |
| 1840 +------------+---------+ --- */ | |
| 1841 | |
| 1842 /* Bit indicating that a new matrix will be allocated or has been | |
| 1843 allocated. */ | |
| 1844 | |
| 1845 #define NEW_LEAF_MATRIX (1 << 0) | |
| 1846 | |
| 1847 /* Bit indicating that a matrix will or has changed its location or | |
| 1848 size. */ | |
| 1849 | |
| 1850 #define CHANGED_LEAF_MATRIX (1 << 1) | |
| 1851 | |
| 1852 static struct dim | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1853 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
|
1854 window_change_flags) |
| 25012 | 1855 Lisp_Object window; |
| 1856 int x, y; | |
| 1857 int dim_only_p; | |
| 1858 int *window_change_flags; | |
| 1859 { | |
| 1860 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
| 1861 int x0 = x, y0 = y; | |
| 1862 int wmax = 0, hmax = 0; | |
| 1863 struct dim total; | |
| 1864 struct dim dim; | |
| 1865 struct window *w; | |
| 1866 int in_horz_combination_p; | |
| 1867 | |
| 1868 /* What combination is WINDOW part of? Compute this once since the | |
| 1869 result is the same for all windows in the `next' chain. The | |
| 1870 special case of a root window (parent equal to nil) is treated | |
| 1871 like a vertical combination because a root window's `next' | |
| 1872 points to the mini-buffer window, if any, which is arranged | |
| 1873 vertically below other windows. */ | |
| 1874 in_horz_combination_p | |
| 1875 = (!NILP (XWINDOW (window)->parent) | |
| 1876 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
| 1877 | |
| 1878 /* For WINDOW and all windows on the same level. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1879 do |
| 25012 | 1880 { |
| 1881 w = XWINDOW (window); | |
| 1882 | |
| 1883 /* 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
|
1884 on whether this is a combination or a leaf window. */ |
| 25012 | 1885 if (!NILP (w->hchild)) |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1886 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
| 25012 | 1887 dim_only_p, |
| 1888 window_change_flags); | |
| 1889 else if (!NILP (w->vchild)) | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1890 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
| 25012 | 1891 dim_only_p, |
| 1892 window_change_flags); | |
| 1893 else | |
| 1894 { | |
| 1895 /* If not already done, allocate sub-matrix structures. */ | |
| 1896 if (w->desired_matrix == NULL) | |
| 1897 { | |
| 1898 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
| 1899 w->current_matrix = new_glyph_matrix (f->current_pool); | |
| 1900 *window_change_flags |= NEW_LEAF_MATRIX; | |
| 1901 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1902 |
| 25012 | 1903 /* Width and height MUST be chosen so that there are no |
| 1904 holes in the frame matrix. */ | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1905 dim.width = required_matrix_width (w); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1906 dim.height = required_matrix_height (w); |
| 25012 | 1907 |
| 1908 /* Will matrix be re-allocated? */ | |
| 1909 if (x != w->desired_matrix->matrix_x | |
| 1910 || y != w->desired_matrix->matrix_y | |
| 1911 || dim.width != w->desired_matrix->matrix_w | |
| 1912 || dim.height != w->desired_matrix->matrix_h | |
| 1913 || (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
|
1914 w->right_margin_cols) |
| 25012 | 1915 != w->desired_matrix->left_margin_glyphs) |
| 1916 || (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
|
1917 w->left_margin_cols) |
| 25012 | 1918 != w->desired_matrix->right_margin_glyphs)) |
| 1919 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
| 1920 | |
| 1921 /* Actually change matrices, if allowed. Do not consider | |
| 1922 CHANGED_LEAF_MATRIX computed above here because the pool | |
| 1923 may have been changed which we don't now here. We trust | |
| 1924 that we only will be called with DIM_ONLY_P != 0 when | |
| 1925 necessary. */ | |
| 1926 if (!dim_only_p) | |
| 1927 { | |
| 1928 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
| 1929 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
| 1930 } | |
| 1931 } | |
| 1932 | |
| 1933 /* If we are part of a horizontal combination, advance x for | |
| 1934 windows to the right of W; otherwise advance y for windows | |
| 1935 below W. */ | |
| 1936 if (in_horz_combination_p) | |
| 1937 x += dim.width; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1938 else |
| 25012 | 1939 y += dim.height; |
| 1940 | |
| 1941 /* Remember maximum glyph matrix dimensions. */ | |
| 1942 wmax = max (wmax, dim.width); | |
| 1943 hmax = max (hmax, dim.height); | |
| 1944 | |
| 1945 /* Next window on same level. */ | |
| 1946 window = w->next; | |
| 1947 } | |
| 1948 while (!NILP (window)); | |
| 1949 | |
| 1950 /* Set `total' to the total glyph matrix dimension of this window | |
| 1951 level. In a vertical combination, the width is the width of the | |
| 1952 widest window; the height is the y we finally reached, corrected | |
| 1953 by the y we started with. In a horizontal combination, the total | |
| 1954 height is the height of the tallest window, and the width is the | |
| 1955 x we finally reached, corrected by the x we started with. */ | |
| 1956 if (in_horz_combination_p) | |
| 1957 { | |
| 1958 total.width = x - x0; | |
| 1959 total.height = hmax; | |
| 1960 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1961 else |
| 25012 | 1962 { |
| 1963 total.width = wmax; | |
| 1964 total.height = y - y0; | |
| 1965 } | |
| 1966 | |
| 1967 return total; | |
| 1968 } | |
| 1969 | |
| 1970 | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1971 /* 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
|
1972 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1973 int |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1974 required_matrix_height (w) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1975 struct window *w; |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1976 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1977 #ifdef HAVE_WINDOW_SYSTEM |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1978 struct frame *f = XFRAME (w->frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1979 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1980 if (FRAME_WINDOW_P (f)) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1981 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1982 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
|
1983 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
|
1984 return (((window_pixel_height + ch_height - 1) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1985 / ch_height) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1986 /* 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
|
1987 bottom of the window. */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1988 + 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
|
1989 /* 2 for header and mode line. */ |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 + 2); |
|
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 #endif /* HAVE_WINDOW_SYSTEM */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1993 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1994 return WINDOW_TOTAL_LINES (w); |
|
39448
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 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1997 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1998 /* 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
|
1999 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2000 int |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2001 required_matrix_width (w) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2002 struct window *w; |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2003 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2004 #ifdef HAVE_WINDOW_SYSTEM |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2005 struct frame *f = XFRAME (w->frame); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 if (FRAME_WINDOW_P (f)) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2007 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2008 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
|
2009 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2010 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2011 /* 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
|
2012 return (((window_pixel_width + ch_width - 1) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2013 / ch_width) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2014 /* 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
|
2015 + 2 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2016 /* One partially visible column at the right |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2017 edge of each marginal area. */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2018 + 1 + 1); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2019 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2020 #endif /* HAVE_WINDOW_SYSTEM */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2021 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2022 return XINT (w->total_cols); |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2023 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2024 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2025 |
| 25012 | 2026 /* Allocate window matrices for window-based redisplay. W is the |
| 2027 window whose matrices must be allocated/reallocated. CH_DIM is the | |
| 2028 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
|
2029 |
| 25012 | 2030 static void |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2031 allocate_matrices_for_window_redisplay (w) |
| 25012 | 2032 struct window *w; |
| 2033 { | |
| 2034 while (w) | |
| 314 | 2035 { |
| 25012 | 2036 if (!NILP (w->vchild)) |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2037 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
| 25012 | 2038 else if (!NILP (w->hchild)) |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2039 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
| 25012 | 2040 else |
| 314 | 2041 { |
| 25012 | 2042 /* W is a leaf window. */ |
| 2043 struct dim dim; | |
| 2044 | |
| 2045 /* If matrices are not yet allocated, allocate them now. */ | |
| 2046 if (w->desired_matrix == NULL) | |
| 314 | 2047 { |
| 25012 | 2048 w->desired_matrix = new_glyph_matrix (NULL); |
| 2049 w->current_matrix = new_glyph_matrix (NULL); | |
| 314 | 2050 } |
| 25012 | 2051 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2052 dim.width = required_matrix_width (w); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2053 dim.height = required_matrix_height (w); |
| 25012 | 2054 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
| 2055 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
| 2056 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2057 |
| 25012 | 2058 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
| 2059 } | |
| 2060 } | |
| 2061 | |
| 2062 | |
| 2063 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
| 2064 do it for all frames; otherwise do it just for the given frame. | |
| 2065 This function must be called when a new frame is created, its size | |
| 2066 changes, or its window configuration changes. */ | |
| 2067 | |
| 2068 void | |
| 2069 adjust_glyphs (f) | |
| 2070 struct frame *f; | |
| 2071 { | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2072 /* 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
|
2073 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
|
2074 BLOCK_INPUT; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2075 |
| 25012 | 2076 if (f) |
| 2077 adjust_frame_glyphs (f); | |
| 2078 else | |
| 2079 { | |
| 2080 Lisp_Object tail, lisp_frame; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2081 |
| 25012 | 2082 FOR_EACH_FRAME (tail, lisp_frame) |
| 2083 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
| 2084 } | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2085 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2086 UNBLOCK_INPUT; |
| 25012 | 2087 } |
| 2088 | |
| 2089 | |
| 2090 /* Adjust frame glyphs when Emacs is initialized. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2091 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2092 To be called from init_display. |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2093 |
| 25012 | 2094 We need a glyph matrix because redraw will happen soon. |
| 2095 Unfortunately, window sizes on selected_frame are not yet set to | |
| 2096 meaningful values. I believe we can assume that there are only two | |
| 2097 windows on the frame---the mini-buffer and the root window. Frame | |
| 2098 height and width seem to be correct so far. So, set the sizes of | |
| 2099 windows to estimated values. */ | |
| 2100 | |
| 2101 static void | |
| 2102 adjust_frame_glyphs_initially () | |
| 2103 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2104 struct frame *sf = SELECTED_FRAME (); |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2105 struct window *root = XWINDOW (sf->root_window); |
| 25012 | 2106 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
|
2107 int frame_lines = FRAME_LINES (sf); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2108 int frame_cols = FRAME_COLS (sf); |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2109 int top_margin = FRAME_TOP_MARGIN (sf); |
| 25012 | 2110 |
| 2111 /* 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
|
2112 XSETFASTINT (root->top_line, top_margin); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2113 XSETFASTINT (root->total_cols, frame_cols); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2114 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
| 25012 | 2115 |
| 2116 /* 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
|
2117 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
|
2118 XSETFASTINT (mini->total_cols, frame_cols); |
| 25012 | 2119 set_window_height (root->next, 1, 0); |
| 2120 | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2121 adjust_frame_glyphs (sf); |
| 25012 | 2122 glyphs_initialized_initially_p = 1; |
| 2123 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2124 |
| 25012 | 2125 |
| 2126 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
| 2127 | |
| 2128 static void | |
| 2129 adjust_frame_glyphs (f) | |
| 2130 struct frame *f; | |
| 2131 { | |
| 2132 if (FRAME_WINDOW_P (f)) | |
| 2133 adjust_frame_glyphs_for_window_redisplay (f); | |
| 2134 else | |
| 2135 adjust_frame_glyphs_for_frame_redisplay (f); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2136 |
| 25012 | 2137 /* Don't forget the message buffer and the buffer for |
| 2138 decode_mode_spec. */ | |
| 2139 adjust_frame_message_buffer (f); | |
| 2140 adjust_decode_mode_spec_buffer (f); | |
| 2141 | |
| 2142 f->glyphs_initialized_p = 1; | |
| 2143 } | |
| 2144 | |
| 2145 | |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2146 /* 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
|
2147 windows from the frame's current matrix. */ |
|
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 static void |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2150 fake_current_matrices (window) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2151 Lisp_Object window; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2152 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2154 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2155 for (; !NILP (window); window = w->next) |
|
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 w = XWINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2158 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2159 if (!NILP (w->hchild)) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2160 fake_current_matrices (w->hchild); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2161 else if (!NILP (w->vchild)) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2162 fake_current_matrices (w->vchild); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2163 else |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2164 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2165 int i; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2166 struct frame *f = XFRAME (w->frame); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2167 struct glyph_matrix *m = w->current_matrix; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2168 struct glyph_matrix *fm = f->current_matrix; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2169 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2170 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
|
2171 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2172 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2173 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
|
2174 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2175 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
|
2176 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
|
2177 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2178 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
|
2179 && 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
|
2180 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2181 r->enabled_p = fr->enabled_p; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2182 if (r->enabled_p) |
|
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 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
|
2185 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
|
2186 r->used[TEXT_AREA] = (m->matrix_w |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 - r->used[LEFT_MARGIN_AREA] |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2188 - r->used[RIGHT_MARGIN_AREA]); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2189 r->mode_line_p = 0; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2190 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2191 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2192 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2193 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2194 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2195 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2196 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2197 /* 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
|
2198 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
|
2199 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2200 static struct glyph_matrix * |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2201 save_current_matrix (f) |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2202 struct frame *f; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2203 { |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2204 int i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2205 struct glyph_matrix *saved; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2206 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2207 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2208 bzero (saved, sizeof *saved); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2209 saved->nrows = f->current_matrix->nrows; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2210 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
|
2211 * sizeof *saved->rows); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2212 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
|
2213 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2214 for (i = 0; i < saved->nrows; ++i) |
|
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 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
|
2217 struct glyph_row *to = saved->rows + i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2218 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
|
2219 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
|
2220 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
|
2221 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
|
2222 } |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2223 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2224 return saved; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2225 } |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2226 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2227 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2228 /* 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
|
2229 and free memory associated with SAVED. */ |
|
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2230 |
|
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2231 static void |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2232 restore_current_matrix (f, saved) |
|
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2233 struct frame *f; |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2234 struct glyph_matrix *saved; |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2235 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2236 int i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2237 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2238 for (i = 0; i < saved->nrows; ++i) |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2239 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2240 struct glyph_row *from = saved->rows + i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2241 struct glyph_row *to = f->current_matrix->rows + i; |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2242 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2243 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2244 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
|
2245 xfree (from->glyphs[TEXT_AREA]); |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2246 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2247 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2248 xfree (saved->rows); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2249 xfree (saved); |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2250 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2251 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2252 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2253 |
| 25012 | 2254 /* Allocate/reallocate glyph matrices of a single frame F for |
| 2255 frame-based redisplay. */ | |
| 2256 | |
| 2257 static void | |
| 2258 adjust_frame_glyphs_for_frame_redisplay (f) | |
| 2259 struct frame *f; | |
| 2260 { | |
| 2261 struct dim ch_dim; | |
| 2262 struct dim matrix_dim; | |
| 2263 int pool_changed_p; | |
| 2264 int window_change_flags; | |
| 2265 int top_window_y; | |
| 2266 | |
| 2267 if (!FRAME_LIVE_P (f)) | |
| 2268 return; | |
| 2269 | |
| 2270 /* Determine the smallest character in any font for F. On | |
| 2271 console windows, all characters have dimension (1, 1). */ | |
| 2272 ch_dim.width = ch_dim.height = 1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2273 |
| 25012 | 2274 top_window_y = FRAME_TOP_MARGIN (f); |
| 2275 | |
| 2276 /* Allocate glyph pool structures if not already done. */ | |
| 2277 if (f->desired_pool == NULL) | |
| 2278 { | |
| 2279 f->desired_pool = new_glyph_pool (); | |
| 2280 f->current_pool = new_glyph_pool (); | |
| 2281 } | |
| 2282 | |
| 2283 /* Allocate frames matrix structures if needed. */ | |
| 2284 if (f->desired_matrix == NULL) | |
| 2285 { | |
| 2286 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
| 2287 f->current_matrix = new_glyph_matrix (f->current_pool); | |
| 2288 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2289 |
| 25012 | 2290 /* Compute window glyph matrices. (This takes the mini-buffer |
| 2291 window into account). The result is the size of the frame glyph | |
| 2292 matrix needed. The variable window_change_flags is set to a bit | |
| 2293 mask indicating whether new matrices will be allocated or | |
| 2294 existing matrices change their size or location within the frame | |
| 2295 matrix. */ | |
| 2296 window_change_flags = 0; | |
| 2297 matrix_dim | |
| 2298 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
| 2299 0, top_window_y, | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2300 1, |
| 25012 | 2301 &window_change_flags); |
| 2302 | |
| 2303 /* Add in menu bar lines, if any. */ | |
| 2304 matrix_dim.height += top_window_y; | |
| 2305 | |
| 2306 /* Enlarge pools as necessary. */ | |
| 2307 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
| 2308 realloc_glyph_pool (f->current_pool, matrix_dim); | |
| 2309 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2310 /* Set up glyph pointers within window matrices. Do this only if |
| 25012 | 2311 absolutely necessary since it requires a frame redraw. */ |
| 2312 if (pool_changed_p || window_change_flags) | |
| 2313 { | |
| 2314 /* Do it for window matrices. */ | |
| 2315 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
|
2316 0, top_window_y, 0, |
| 25012 | 2317 &window_change_flags); |
| 2318 | |
| 2319 /* Size of frame matrices must equal size of frame. Note | |
| 2320 that we are called for X frames with window widths NOT equal | |
| 2321 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
|
2322 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
|
2323 && matrix_dim.height == FRAME_LINES (f)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2324 |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2325 /* Pointers to glyph memory in glyph rows are exchanged during |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2326 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
|
2327 frame's current matrix consists of pointers into both the |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2328 desired and current glyph pool of the frame. Adjusting a |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2329 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
|
2330 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
|
2331 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
|
2332 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
|
2333 matrix' contents from that copy. */ |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2334 if (display_completed |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2335 && !FRAME_GARBAGED_P (f) |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2336 && matrix_dim.width == f->current_matrix->matrix_w |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2337 && matrix_dim.height == f->current_matrix->matrix_h) |
|
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 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
|
2340 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
|
2341 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
|
2342 restore_current_matrix (f, copy); |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2343 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2344 } |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2345 else |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2346 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2347 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
|
2348 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
|
2349 SET_FRAME_GARBAGED (f); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2350 } |
| 25012 | 2351 } |
| 2352 } | |
| 2353 | |
| 2354 | |
| 2355 /* Allocate/reallocate glyph matrices of a single frame F for | |
| 2356 window-based redisplay. */ | |
| 2357 | |
| 2358 static void | |
| 2359 adjust_frame_glyphs_for_window_redisplay (f) | |
| 2360 struct frame *f; | |
| 2361 { | |
| 2362 struct dim ch_dim; | |
| 2363 struct window *w; | |
| 2364 | |
| 2365 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2366 |
| 25012 | 2367 /* Get minimum sizes. */ |
| 2368 #ifdef HAVE_WINDOW_SYSTEM | |
| 2369 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); | |
| 2370 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f); | |
| 2371 #else | |
| 2372 ch_dim.width = ch_dim.height = 1; | |
| 2373 #endif | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2374 |
| 25012 | 2375 /* Allocate/reallocate window matrices. */ |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2376 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
| 25012 | 2377 |
| 2378 /* Allocate/ reallocate matrices of the dummy window used to display | |
| 2379 the menu bar under X when no X toolkit support is available. */ | |
| 49322 | 2380 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
| 25012 | 2381 { |
| 2382 /* Allocate a dummy window if not already done. */ | |
| 2383 if (NILP (f->menu_bar_window)) | |
| 2384 { | |
| 2385 f->menu_bar_window = make_window (); | |
| 2386 w = XWINDOW (f->menu_bar_window); | |
| 2387 XSETFRAME (w->frame, f); | |
| 2388 w->pseudo_window_p = 1; | |
| 2389 } | |
| 2390 else | |
| 2391 w = XWINDOW (f->menu_bar_window); | |
| 2392 | |
| 2393 /* Set window dimensions to frame dimensions and allocate or | |
| 2394 adjust glyph matrices of W. */ | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2395 XSETFASTINT (w->top_line, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2396 XSETFASTINT (w->left_col, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2397 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
|
2398 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
|
2399 allocate_matrices_for_window_redisplay (w); |
| 25012 | 2400 } |
| 2401 #endif /* not USE_X_TOOLKIT */ | |
| 2402 | |
| 49322 | 2403 #ifndef USE_GTK |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2404 /* 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
|
2405 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
|
2406 if (NILP (f->tool_bar_window)) |
| 25012 | 2407 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2408 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
|
2409 w = XWINDOW (f->tool_bar_window); |
| 25012 | 2410 XSETFRAME (w->frame, f); |
| 2411 w->pseudo_window_p = 1; | |
| 2412 } | |
| 2413 else | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2414 w = XWINDOW (f->tool_bar_window); |
| 25012 | 2415 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2416 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
|
2417 XSETFASTINT (w->left_col, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2418 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
|
2419 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
|
2420 allocate_matrices_for_window_redisplay (w); |
| 49322 | 2421 #endif |
| 25012 | 2422 } |
| 2423 | |
| 2424 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2425 /* Adjust/ allocate message buffer of frame F. |
| 25012 | 2426 |
| 2427 Note that the message buffer is never freed. Since I could not | |
| 2428 find a free in 19.34, I assume that freeing it would be | |
| 2429 problematic in some way and don't do it either. | |
| 2430 | |
| 2431 (Implementation note: It should be checked if we can free it | |
| 2432 eventually without causing trouble). */ | |
| 2433 | |
| 2434 static void | |
| 2435 adjust_frame_message_buffer (f) | |
| 2436 struct frame *f; | |
| 2437 { | |
| 2438 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
| 2439 | |
| 2440 if (FRAME_MESSAGE_BUF (f)) | |
| 2441 { | |
| 2442 char *buffer = FRAME_MESSAGE_BUF (f); | |
| 2443 char *new_buffer = (char *) xrealloc (buffer, size); | |
| 2444 FRAME_MESSAGE_BUF (f) = new_buffer; | |
| 2445 } | |
| 2446 else | |
| 2447 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
| 2448 } | |
| 2449 | |
| 2450 | |
| 2451 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
| 2452 | |
| 2453 static void | |
| 2454 adjust_decode_mode_spec_buffer (f) | |
| 2455 struct frame *f; | |
| 2456 { | |
| 2457 f->decode_mode_spec_buffer | |
| 2458 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
| 2459 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
| 2460 } | |
| 2461 | |
| 2462 | |
| 2463 | |
| 2464 /********************************************************************** | |
| 2465 Freeing Glyph Matrices | |
| 2466 **********************************************************************/ | |
| 2467 | |
| 2468 /* Free glyph memory for a frame F. F may be null. This function can | |
| 2469 be called for the same frame more than once. The root window of | |
| 2470 F may be nil when this function is called. This is the case when | |
| 2471 the function is called when F is destroyed. */ | |
| 2472 | |
| 2473 void | |
| 2474 free_glyphs (f) | |
| 2475 struct frame *f; | |
| 2476 { | |
| 2477 if (f && f->glyphs_initialized_p) | |
| 2478 { | |
|
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2479 /* 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
|
2480 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
|
2481 BLOCK_INPUT; |
| 25012 | 2482 f->glyphs_initialized_p = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2483 |
| 25012 | 2484 /* Release window sub-matrices. */ |
| 2485 if (!NILP (f->root_window)) | |
| 2486 free_window_matrices (XWINDOW (f->root_window)); | |
| 2487 | |
| 2488 /* Free the dummy window for menu bars without X toolkit and its | |
| 2489 glyph matrices. */ | |
| 2490 if (!NILP (f->menu_bar_window)) | |
| 2491 { | |
| 2492 struct window *w = XWINDOW (f->menu_bar_window); | |
| 2493 free_glyph_matrix (w->desired_matrix); | |
| 2494 free_glyph_matrix (w->current_matrix); | |
| 2495 w->desired_matrix = w->current_matrix = NULL; | |
| 2496 f->menu_bar_window = Qnil; | |
| 2497 } | |
| 2498 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2499 /* 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
|
2500 if (!NILP (f->tool_bar_window)) |
| 25012 | 2501 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2502 struct window *w = XWINDOW (f->tool_bar_window); |
| 25012 | 2503 free_glyph_matrix (w->desired_matrix); |
| 2504 free_glyph_matrix (w->current_matrix); | |
| 2505 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
|
2506 f->tool_bar_window = Qnil; |
| 25012 | 2507 } |
| 2508 | |
| 2509 /* Release frame glyph matrices. Reset fields to zero in | |
| 2510 case we are called a second time. */ | |
| 2511 if (f->desired_matrix) | |
| 2512 { | |
| 2513 free_glyph_matrix (f->desired_matrix); | |
| 2514 free_glyph_matrix (f->current_matrix); | |
| 2515 f->desired_matrix = f->current_matrix = NULL; | |
| 2516 } | |
| 2517 | |
| 2518 /* Release glyph pools. */ | |
| 2519 if (f->desired_pool) | |
| 2520 { | |
| 2521 free_glyph_pool (f->desired_pool); | |
| 2522 free_glyph_pool (f->current_pool); | |
| 2523 f->desired_pool = f->current_pool = NULL; | |
| 314 | 2524 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2525 |
|
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2526 UNBLOCK_INPUT; |
| 314 | 2527 } |
| 2528 } | |
| 2529 | |
| 25012 | 2530 |
| 2531 /* Free glyph sub-matrices in the window tree rooted at W. This | |
| 2532 function may be called with a null pointer, and it may be called on | |
| 2533 the same tree more than once. */ | |
| 2534 | |
| 2535 void | |
| 2536 free_window_matrices (w) | |
| 2537 struct window *w; | |
| 2538 { | |
| 2539 while (w) | |
| 2540 { | |
| 2541 if (!NILP (w->hchild)) | |
| 2542 free_window_matrices (XWINDOW (w->hchild)); | |
| 2543 else if (!NILP (w->vchild)) | |
| 2544 free_window_matrices (XWINDOW (w->vchild)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2545 else |
| 25012 | 2546 { |
| 2547 /* This is a leaf window. Free its memory and reset fields | |
| 2548 to zero in case this function is called a second time for | |
| 2549 W. */ | |
| 2550 free_glyph_matrix (w->current_matrix); | |
| 2551 free_glyph_matrix (w->desired_matrix); | |
| 2552 w->current_matrix = w->desired_matrix = NULL; | |
| 2553 } | |
| 2554 | |
| 2555 /* Next window on same level. */ | |
| 2556 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 2557 } | |
| 2558 } | |
| 2559 | |
| 2560 | |
| 2561 /* Check glyph memory leaks. This function is called from | |
| 2562 shut_down_emacs. Note that frames are not destroyed when Emacs | |
| 2563 exits. We therefore free all glyph memory for all active frames | |
| 2564 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
|
2565 |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2566 void |
| 25012 | 2567 check_glyph_memory () |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2568 { |
| 25012 | 2569 Lisp_Object tail, frame; |
| 2570 | |
| 2571 /* Free glyph memory for all frames. */ | |
| 2572 FOR_EACH_FRAME (tail, frame) | |
| 2573 free_glyphs (XFRAME (frame)); | |
| 2574 | |
| 2575 /* Check that nothing is left allocated. */ | |
| 2576 if (glyph_matrix_count) | |
| 2577 abort (); | |
| 2578 if (glyph_pool_count) | |
| 2579 abort (); | |
| 2580 } | |
| 2581 | |
| 2582 | |
| 2583 | |
| 2584 /********************************************************************** | |
| 2585 Building a Frame Matrix | |
| 2586 **********************************************************************/ | |
| 2587 | |
| 2588 /* Most of the redisplay code works on glyph matrices attached to | |
| 2589 windows. This is a good solution most of the time, but it is not | |
| 2590 suitable for terminal code. Terminal output functions cannot rely | |
| 2591 on being able to set an arbitrary terminal window. Instead they | |
| 2592 must be provided with a view of the whole frame, i.e. the whole | |
| 2593 screen. We build such a view by constructing a frame matrix from | |
| 2594 window matrices in this section. | |
| 2595 | |
| 2596 Windows that must be updated have their must_be_update_p flag set. | |
| 2597 For all such windows, their desired matrix is made part of the | |
| 2598 desired frame matrix. For other windows, their current matrix is | |
| 2599 made part of the desired frame matrix. | |
| 2600 | |
| 2601 +-----------------+----------------+ | |
| 2602 | desired | desired | | |
| 2603 | | | | |
| 2604 +-----------------+----------------+ | |
| 2605 | current | | |
| 2606 | | | |
| 2607 +----------------------------------+ | |
| 2608 | |
| 2609 Desired window matrices can be made part of the frame matrix in a | |
| 2610 cheap way: We exploit the fact that the desired frame matrix and | |
| 2611 desired window matrices share their glyph memory. This is not | |
| 2612 possible for current window matrices. Their glyphs are copied to | |
| 2613 the desired frame matrix. The latter is equivalent to | |
| 2614 preserve_other_columns in the old redisplay. | |
| 2615 | |
| 2616 Used glyphs counters for frame matrix rows are the result of adding | |
| 2617 up glyph lengths of the window matrices. A line in the frame | |
| 2618 matrix is enabled, if a corresponding line in a window matrix is | |
| 2619 enabled. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2620 |
| 25012 | 2621 After building the desired frame matrix, it will be passed to |
| 2622 terminal code, which will manipulate both the desired and current | |
| 2623 frame matrix. Changes applied to the frame's current matrix have | |
| 2624 to be visible in current window matrices afterwards, of course. | |
| 2625 | |
| 2626 This problem is solved like this: | |
| 2627 | |
| 2628 1. Window and frame matrices share glyphs. Window matrices are | |
| 2629 constructed in a way that their glyph contents ARE the glyph | |
| 2630 contents needed in a frame matrix. Thus, any modification of | |
| 2631 glyphs done in terminal code will be reflected in window matrices | |
| 2632 automatically. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2633 |
| 25012 | 2634 2. Exchanges of rows in a frame matrix done by terminal code are |
| 2635 intercepted by hook functions so that corresponding row operations | |
| 2636 on window matrices can be performed. This is necessary because we | |
| 2637 use pointers to glyphs in glyph row structures. To satisfy the | |
| 2638 assumption of point 1 above that glyphs are updated implicitly in | |
| 2639 window matrices when they are manipulated via the frame matrix, | |
| 2640 window and frame matrix must of course agree where to find the | |
| 2641 glyphs for their rows. Possible manipulations that must be | |
| 2642 mirrored are assignments of rows of the desired frame matrix to the | |
| 2643 current frame matrix and scrolling the current frame matrix. */ | |
| 2644 | |
| 2645 /* Build frame F's desired matrix from window matrices. Only windows | |
| 2646 which have the flag must_be_updated_p set have to be updated. Menu | |
| 2647 bar lines of a frame are not covered by window matrices, so make | |
| 2648 sure not to touch them in this function. */ | |
| 2649 | |
| 2650 static void | |
| 2651 build_frame_matrix (f) | |
| 2652 struct frame *f; | |
| 2653 { | |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2654 int i; |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2655 |
| 25012 | 2656 /* F must have a frame matrix when this function is called. */ |
| 2657 xassert (!FRAME_WINDOW_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2658 |
| 25012 | 2659 /* Clear all rows in the frame matrix covered by window matrices. |
| 2660 Menu bar lines are not covered by windows. */ | |
| 2661 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
| 2662 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
| 2663 | |
| 2664 /* Build the matrix by walking the window tree. */ | |
| 2665 build_frame_matrix_from_window_tree (f->desired_matrix, | |
| 2666 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
| 2667 } | |
| 2668 | |
| 2669 | |
| 2670 /* Walk a window tree, building a frame matrix MATRIX from window | |
| 2671 matrices. W is the root of a window tree. */ | |
| 2672 | |
| 2673 static void | |
| 2674 build_frame_matrix_from_window_tree (matrix, w) | |
| 2675 struct glyph_matrix *matrix; | |
| 2676 struct window *w; | |
| 2677 { | |
| 2678 while (w) | |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2679 { |
| 25012 | 2680 if (!NILP (w->hchild)) |
| 2681 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
| 2682 else if (!NILP (w->vchild)) | |
| 2683 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
| 2684 else | |
| 2685 build_frame_matrix_from_leaf_window (matrix, w); | |
| 2686 | |
| 2687 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
|
2688 } |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2689 } |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2690 |
| 25012 | 2691 |
| 2692 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
| 2693 desired frame matrix built. W is a leaf window whose desired or | |
| 2694 current matrix is to be added to FRAME_MATRIX. W's flag | |
| 2695 must_be_updated_p determines which matrix it contributes to | |
| 2696 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
| 2697 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
| 2698 Adding a desired matrix means setting up used counters and such in | |
| 2699 frame rows, while adding a current window matrix to FRAME_MATRIX | |
| 2700 means copying glyphs. The latter case corresponds to | |
| 2701 preserve_other_columns in the old redisplay. */ | |
| 2702 | |
| 2703 static void | |
| 2704 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
| 2705 struct glyph_matrix *frame_matrix; | |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2706 struct window *w; |
|
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2707 { |
| 25012 | 2708 struct glyph_matrix *window_matrix; |
| 2709 int window_y, frame_y; | |
| 2710 /* If non-zero, a glyph to insert at the right border of W. */ | |
| 2711 GLYPH right_border_glyph = 0; | |
| 2712 | |
| 2713 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
| 2714 if (w->must_be_updated_p) | |
| 2715 { | |
| 2716 window_matrix = w->desired_matrix; | |
| 2717 | |
| 2718 /* Decide whether we want to add a vertical border glyph. */ | |
| 2719 if (!WINDOW_RIGHTMOST_P (w)) | |
| 2720 { | |
| 2721 struct Lisp_Char_Table *dp = window_display_table (w); | |
| 2722 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) | |
| 2723 ? XINT (DISP_BORDER_GLYPH (dp)) | |
| 2724 : '|'); | |
| 2725 } | |
| 2726 } | |
| 2727 else | |
| 2728 window_matrix = w->current_matrix; | |
| 2729 | |
| 2730 /* For all rows in the window matrix and corresponding rows in the | |
| 2731 frame matrix. */ | |
| 2732 window_y = 0; | |
| 2733 frame_y = window_matrix->matrix_y; | |
| 2734 while (window_y < window_matrix->nrows) | |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2735 { |
| 25012 | 2736 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
| 2737 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
|
2738 int current_row_p = window_matrix == w->current_matrix; |
| 25012 | 2739 |
| 2740 /* Fill up the frame row with spaces up to the left margin of the | |
| 2741 window row. */ | |
| 2742 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
| 2743 | |
| 2744 /* Fill up areas in the window matrix row with spaces. */ | |
| 2745 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
|
2746 |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2747 /* 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
|
2748 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
|
2749 row instead. */ |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2750 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
|
2751 && !window_row->enabled_p) |
|
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2752 { |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2753 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
|
2754 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
|
2755 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2756 |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2757 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
|
2758 { |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2759 /* Copy window row to frame row. */ |
| 25012 | 2760 bcopy (window_row->glyphs[0], |
| 2761 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
| 2762 window_matrix->matrix_w * sizeof (struct glyph)); | |
| 2763 } | |
| 2764 else | |
| 2765 { | |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2766 xassert (window_row->enabled_p); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2767 |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2768 /* 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
|
2769 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
|
2770 frame_row->enabled_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2771 |
| 25012 | 2772 /* Maybe insert a vertical border between horizontally adjacent |
| 2773 windows. */ | |
| 2774 if (right_border_glyph) | |
| 2775 { | |
| 2776 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
| 2777 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
| 2778 } | |
| 2779 | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2780 /* 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
|
2781 frame_y. */ |
| 25012 | 2782 xassert (glyph_row_slice_p (window_row, frame_row)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2783 |
| 25012 | 2784 /* If rows are in sync, we don't have to copy glyphs because |
| 2785 frame and window share glyphs. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2786 |
|
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2787 #if GLYPH_DEBUG |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2788 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
|
2789 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
|
2790 #endif |
| 25012 | 2791 } |
| 2792 | |
| 2793 /* Set number of used glyphs in the frame matrix. Since we fill | |
| 2794 up with spaces, and visit leaf windows from left to right it | |
| 2795 can be done simply. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2796 frame_row->used[TEXT_AREA] |
| 25012 | 2797 = window_matrix->matrix_x + window_matrix->matrix_w; |
| 2798 | |
| 2799 /* Next row. */ | |
| 2800 ++window_y; | |
| 2801 ++frame_y; | |
| 2802 } | |
| 2803 } | |
| 2804 | |
| 2805 | |
| 2806 /* Add spaces to a glyph row ROW in a window matrix. | |
| 2807 | |
| 2808 Each row has the form: | |
| 2809 | |
| 2810 +---------+-----------------------------+------------+ | |
| 2811 | left | text | right | | |
| 2812 +---------+-----------------------------+------------+ | |
| 2813 | |
| 2814 Left and right marginal areas are optional. This function adds | |
| 2815 spaces to areas so that there are no empty holes between areas. | |
| 2816 In other words: If the right area is not empty, the text area | |
| 2817 is filled up with spaces up to the right area. If the text area | |
| 2818 is not empty, the left area is filled up. | |
| 2819 | |
| 2820 To be called for frame-based redisplay, only. */ | |
| 2821 | |
| 2822 static void | |
| 2823 fill_up_glyph_row_with_spaces (row) | |
| 2824 struct glyph_row *row; | |
| 2825 { | |
| 2826 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
| 2827 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
| 2828 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
| 2829 } | |
| 2830 | |
| 2831 | |
| 2832 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
| 2833 frame-based redisplay only. */ | |
| 2834 | |
| 2835 static void | |
| 2836 fill_up_glyph_row_area_with_spaces (row, area) | |
| 2837 struct glyph_row *row; | |
| 2838 int area; | |
| 2839 { | |
| 2840 if (row->glyphs[area] < row->glyphs[area + 1]) | |
| 2841 { | |
| 2842 struct glyph *end = row->glyphs[area + 1]; | |
| 2843 struct glyph *text = row->glyphs[area] + row->used[area]; | |
| 2844 | |
| 2845 while (text < end) | |
| 2846 *text++ = space_glyph; | |
| 2847 row->used[area] = text - row->glyphs[area]; | |
| 2848 } | |
| 2849 } | |
| 2850 | |
| 2851 | |
| 2852 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
| 2853 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
| 2854 | |
| 2855 static void | |
| 2856 fill_up_frame_row_with_spaces (row, upto) | |
| 2857 struct glyph_row *row; | |
| 2858 int upto; | |
| 2859 { | |
| 2860 int i = row->used[TEXT_AREA]; | |
| 2861 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2862 |
| 25012 | 2863 while (i < upto) |
| 2864 glyph[i++] = space_glyph; | |
| 2865 | |
| 2866 row->used[TEXT_AREA] = i; | |
| 2867 } | |
| 2868 | |
| 2869 | |
| 2870 | |
| 2871 /********************************************************************** | |
| 2872 Mirroring operations on frame matrices in window matrices | |
| 2873 **********************************************************************/ | |
| 2874 | |
| 2875 /* Set frame being updated via frame-based redisplay to F. This | |
| 2876 function must be called before updates to make explicit that we are | |
| 2877 working on frame matrices or not. */ | |
| 2878 | |
| 2879 static INLINE void | |
| 2880 set_frame_matrix_frame (f) | |
| 2881 struct frame *f; | |
| 2882 { | |
| 2883 frame_matrix_frame = f; | |
| 2884 } | |
| 2885 | |
| 2886 | |
| 2887 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
| 2888 DESIRED_MATRIX is the desired matrix corresponding to | |
| 2889 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
| 2890 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
| 2891 frame_matrix_frame is non-null, this indicates that the exchange is | |
| 2892 done in frame matrices, and that we have to perform analogous | |
| 2893 operations in window matrices of frame_matrix_frame. */ | |
| 2894 | |
| 2895 static INLINE void | |
| 2896 make_current (desired_matrix, current_matrix, row) | |
| 2897 struct glyph_matrix *desired_matrix, *current_matrix; | |
| 2898 int row; | |
| 2899 { | |
| 2900 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
| 2901 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
|
2902 int mouse_face_p = current_row->mouse_face_p; |
| 25012 | 2903 |
| 2904 /* Do current_row = desired_row. This exchanges glyph pointers | |
| 2905 between both rows, and does a structure assignment otherwise. */ | |
| 2906 assign_row (current_row, desired_row); | |
| 2907 | |
| 2908 /* Enable current_row to mark it as valid. */ | |
| 2909 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
|
2910 current_row->mouse_face_p = mouse_face_p; |
| 25012 | 2911 |
| 2912 /* If we are called on frame matrices, perform analogous operations | |
| 2913 for window matrices. */ | |
| 2914 if (frame_matrix_frame) | |
| 2915 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
| 2916 } | |
| 2917 | |
| 2918 | |
| 2919 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
| 2920 W's frame which has been made current (by swapping pointers between | |
| 2921 current and desired matrix). Perform analogous operations in the | |
| 2922 matrices of leaf windows in the window tree rooted at W. */ | |
| 2923 | |
| 2924 static void | |
| 2925 mirror_make_current (w, frame_row) | |
| 2926 struct window *w; | |
| 2927 int frame_row; | |
| 2928 { | |
| 2929 while (w) | |
| 2930 { | |
| 2931 if (!NILP (w->hchild)) | |
| 2932 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
| 2933 else if (!NILP (w->vchild)) | |
| 2934 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
| 2935 else | |
| 2936 { | |
| 2937 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
| 2938 here because the checks performed in debug mode there | |
| 2939 will not allow the conversion. */ | |
| 2940 int row = frame_row - w->desired_matrix->matrix_y; | |
| 2941 | |
| 2942 /* If FRAME_ROW is within W, assign the desired row to the | |
| 2943 current row (exchanging glyph pointers). */ | |
| 2944 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
|
2945 { |
| 25012 | 2946 struct glyph_row *current_row |
| 2947 = MATRIX_ROW (w->current_matrix, row); | |
| 2948 struct glyph_row *desired_row | |
| 2949 = 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
|
2950 |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2951 if (desired_row->enabled_p) |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2952 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
|
2953 else |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2954 swap_glyph_pointers (desired_row, current_row); |
| 25012 | 2955 current_row->enabled_p = 1; |
|
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2956 } |
|
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2957 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2958 |
| 25012 | 2959 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2960 } |
|
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2961 } |
| 25012 | 2962 |
| 2963 | |
| 2964 /* Perform row dance after scrolling. We are working on the range of | |
| 2965 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
| 2966 including) in MATRIX. COPY_FROM is a vector containing, for each | |
| 2967 row I in the range 0 <= I < NLINES, the index of the original line | |
| 2968 to move to I. This index is relative to the row range, i.e. 0 <= | |
| 2969 index < NLINES. RETAINED_P is a vector containing zero for each | |
| 2970 row 0 <= I < NLINES which is empty. | |
| 2971 | |
| 2972 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
|
2973 |
| 25012 | 2974 void |
| 2975 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
| 2976 retained_p) | |
| 2977 struct glyph_matrix *matrix; | |
| 2978 int unchanged_at_top, nlines; | |
| 2979 int *copy_from; | |
| 2980 char *retained_p; | |
| 2981 { | |
| 2982 /* A copy of original rows. */ | |
| 2983 struct glyph_row *old_rows; | |
| 2984 | |
| 2985 /* Rows to assign to. */ | |
| 2986 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
|
2987 |
| 25012 | 2988 int i; |
| 2989 | |
| 2990 /* Make a copy of the original rows. */ | |
| 2991 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
| 2992 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
| 2993 | |
| 2994 /* Assign new rows, maybe clear lines. */ | |
| 2995 for (i = 0; i < nlines; ++i) | |
| 2996 { | |
| 2997 int enabled_before_p = new_rows[i].enabled_p; | |
| 2998 | |
| 2999 xassert (i + unchanged_at_top < matrix->nrows); | |
| 3000 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
| 3001 new_rows[i] = old_rows[copy_from[i]]; | |
| 3002 new_rows[i].enabled_p = enabled_before_p; | |
| 3003 | |
| 3004 /* RETAINED_P is zero for empty lines. */ | |
| 3005 if (!retained_p[copy_from[i]]) | |
| 3006 new_rows[i].enabled_p = 0; | |
| 3007 } | |
| 3008 | |
|
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
|
3009 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
| 25012 | 3010 if (frame_matrix_frame) |
| 3011 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
| 3012 unchanged_at_top, nlines, copy_from, retained_p); | |
| 3013 } | |
| 3014 | |
| 3015 | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3016 /* 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
|
3017 the current frame matrix. */ |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3018 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3019 static void |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3020 sync_window_with_frame_matrix_rows (w) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3021 struct window *w; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3022 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3023 struct frame *f = XFRAME (w->frame); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3024 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
|
3025 int left, right, x, width; |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3026 |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3027 /* 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
|
3028 xassert (NILP (w->hchild) && NILP (w->vchild)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3029 xassert (!FRAME_WINDOW_P (f)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3030 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3031 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
|
3032 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
|
3033 x = w->current_matrix->matrix_x; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3034 width = w->current_matrix->matrix_w; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3035 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3036 window_row = w->current_matrix->rows; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3037 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
|
3038 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
|
3039 |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3040 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
|
3041 { |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3042 window_row->glyphs[LEFT_MARGIN_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3043 = frame_row->glyphs[0] + x; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3044 window_row->glyphs[TEXT_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3045 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3046 window_row->glyphs[LAST_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3047 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3048 window_row->glyphs[RIGHT_MARGIN_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3049 = window_row->glyphs[LAST_AREA] - right; |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3050 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3051 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3052 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3053 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3054 /* 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
|
3055 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
|
3056 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3057 struct window * |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3058 frame_row_to_window (w, row) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3059 struct window *w; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3060 int row; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3061 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3062 struct window *found = NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3063 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3064 while (w && !found) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3065 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3066 if (!NILP (w->hchild)) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3067 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
|
3068 else if (!NILP (w->vchild)) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3069 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
|
3070 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
|
3071 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3072 found = w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3073 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3074 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
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 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3077 return found; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3078 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3079 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3080 |
| 25012 | 3081 /* Perform a line dance in the window tree rooted at W, after |
| 3082 scrolling a frame matrix in mirrored_line_dance. | |
| 3083 | |
| 3084 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
| 3085 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
| 3086 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
| 3087 I < NLINES, the index of the original line to move to I. This | |
| 3088 index is relative to the row range, i.e. 0 <= index < NLINES. | |
| 3089 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
| 3090 which is empty. */ | |
| 3091 | |
| 3092 static void | |
| 3093 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
| 3094 struct window *w; | |
| 3095 int unchanged_at_top, nlines; | |
| 3096 int *copy_from; | |
| 3097 char *retained_p; | |
| 3098 { | |
| 3099 while (w) | |
| 3100 { | |
| 3101 if (!NILP (w->hchild)) | |
| 3102 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
| 3103 nlines, copy_from, retained_p); | |
| 3104 else if (!NILP (w->vchild)) | |
| 3105 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
| 3106 nlines, copy_from, retained_p); | |
| 3107 else | |
| 3108 { | |
| 3109 /* W is a leaf window, and we are working on its current | |
| 3110 matrix m. */ | |
| 3111 struct glyph_matrix *m = w->current_matrix; | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3112 int i, sync_p = 0; |
| 25012 | 3113 struct glyph_row *old_rows; |
| 3114 | |
| 3115 /* Make a copy of the original rows of matrix m. */ | |
| 3116 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
| 3117 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
| 3118 | |
| 3119 for (i = 0; i < nlines; ++i) | |
| 3120 { | |
| 3121 /* Frame relative line assigned to. */ | |
| 3122 int frame_to = i + unchanged_at_top; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3123 |
| 25012 | 3124 /* Frame relative line assigned. */ |
| 3125 int frame_from = copy_from[i] + unchanged_at_top; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3126 |
| 25012 | 3127 /* Window relative line assigned to. */ |
| 3128 int window_to = frame_to - m->matrix_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3129 |
| 25012 | 3130 /* Window relative line assigned. */ |
| 3131 int window_from = frame_from - m->matrix_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3132 |
| 25012 | 3133 /* Is assigned line inside window? */ |
| 3134 int from_inside_window_p | |
| 3135 = window_from >= 0 && window_from < m->matrix_h; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3136 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3137 /* Is assigned to line inside window? */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3138 int to_inside_window_p |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3139 = window_to >= 0 && window_to < m->matrix_h; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3140 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3141 if (from_inside_window_p && to_inside_window_p) |
| 25012 | 3142 { |
| 3143 /* Enabled setting before assignment. */ | |
| 3144 int enabled_before_p; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3145 |
| 25012 | 3146 /* Do the assignment. The enabled_p flag is saved |
| 3147 over the assignment because the old redisplay did | |
| 3148 that. */ | |
| 3149 enabled_before_p = m->rows[window_to].enabled_p; | |
| 3150 m->rows[window_to] = old_rows[window_from]; | |
| 3151 m->rows[window_to].enabled_p = enabled_before_p; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3152 |
| 25012 | 3153 /* If frame line is empty, window line is empty, too. */ |
| 3154 if (!retained_p[copy_from[i]]) | |
| 3155 m->rows[window_to].enabled_p = 0; | |
| 3156 } | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3157 else if (to_inside_window_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3158 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3159 /* A copy between windows. This is an infrequent |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3160 case not worth optimizing. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3161 struct frame *f = XFRAME (w->frame); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3162 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3163 struct window *w2; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3164 struct glyph_matrix *m2; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3165 int m2_from; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3166 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3167 w2 = frame_row_to_window (root, frame_to); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3168 m2 = w2->current_matrix; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3169 m2_from = frame_from - m2->matrix_y; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3170 copy_row_except_pointers (m->rows + window_to, |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3171 m2->rows + m2_from); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3172 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3173 /* If frame line is empty, window line is empty, too. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3174 if (!retained_p[copy_from[i]]) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3175 m->rows[window_to].enabled_p = 0; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3176 sync_p = 1; |
|
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 else if (from_inside_window_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3179 sync_p = 1; |
| 25012 | 3180 } |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3181 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3182 /* 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
|
3183 pointers are in sync with the frame matrix. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3184 if (sync_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3185 sync_window_with_frame_matrix_rows (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3186 |
| 25012 | 3187 /* Check that no pointers are lost. */ |
| 3188 CHECK_MATRIX (m); | |
| 3189 } | |
| 3190 | |
| 3191 /* Next window on same level. */ | |
| 3192 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 3193 } | |
| 3194 } | |
| 3195 | |
| 3196 | |
| 3197 #if GLYPH_DEBUG | |
| 3198 | |
| 3199 /* Check that window and frame matrices agree about their | |
| 3200 understanding where glyphs of the rows are to find. For each | |
| 3201 window in the window tree rooted at W, check that rows in the | |
| 3202 matrices of leaf window agree with their frame matrices about | |
| 3203 glyph pointers. */ | |
| 314 | 3204 |
| 21514 | 3205 void |
| 25012 | 3206 check_window_matrix_pointers (w) |
| 314 | 3207 struct window *w; |
| 3208 { | |
| 25012 | 3209 while (w) |
| 3210 { | |
| 3211 if (!NILP (w->hchild)) | |
| 3212 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
| 3213 else if (!NILP (w->vchild)) | |
| 3214 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
| 3215 else | |
| 3216 { | |
| 3217 struct frame *f = XFRAME (w->frame); | |
| 3218 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
| 3219 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
| 3220 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3221 |
| 25012 | 3222 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
| 3223 } | |
| 3224 } | |
| 3225 | |
| 3226 | |
| 3227 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
| 3228 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
| 3229 each row in WINDOW_MATRIX check that it's a slice of the | |
| 3230 corresponding frame row. If it isn't, abort. */ | |
| 3231 | |
| 3232 static void | |
| 3233 check_matrix_pointers (window_matrix, frame_matrix) | |
| 3234 struct glyph_matrix *window_matrix, *frame_matrix; | |
| 3235 { | |
| 3236 /* Row number in WINDOW_MATRIX. */ | |
| 3237 int i = 0; | |
| 3238 | |
| 3239 /* Row number corresponding to I in FRAME_MATRIX. */ | |
| 3240 int j = window_matrix->matrix_y; | |
| 3241 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3242 /* For all rows check that the row in the window matrix is a |
| 25012 | 3243 slice of the row in the frame matrix. If it isn't we didn't |
| 3244 mirror an operation on the frame matrix correctly. */ | |
| 3245 while (i < window_matrix->nrows) | |
| 3246 { | |
| 3247 if (!glyph_row_slice_p (window_matrix->rows + i, | |
| 3248 frame_matrix->rows + j)) | |
| 3249 abort (); | |
| 3250 ++i, ++j; | |
| 3251 } | |
| 3252 } | |
| 3253 | |
| 3254 #endif /* GLYPH_DEBUG != 0 */ | |
| 3255 | |
| 3256 | |
| 3257 | |
| 3258 /********************************************************************** | |
| 3259 VPOS and HPOS translations | |
| 3260 **********************************************************************/ | |
| 3261 | |
| 3262 #if GLYPH_DEBUG | |
| 3263 | |
| 3264 /* Translate vertical position VPOS which is relative to window W to a | |
| 3265 vertical position relative to W's frame. */ | |
| 3266 | |
| 3267 static int | |
| 3268 window_to_frame_vpos (w, vpos) | |
| 3269 struct window *w; | |
| 3270 int vpos; | |
| 3271 { | |
| 3272 struct frame *f = XFRAME (w->frame); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3273 |
| 25012 | 3274 xassert (!FRAME_WINDOW_P (f)); |
| 3275 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
|
3276 vpos += WINDOW_TOP_EDGE_LINE (w); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3277 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
| 25012 | 3278 return vpos; |
| 3279 } | |
| 3280 | |
| 3281 | |
| 3282 /* 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
|
3283 a horizontal position relative to W's frame. */ |
| 25012 | 3284 |
| 3285 static int | |
| 3286 window_to_frame_hpos (w, hpos) | |
| 3287 struct window *w; | |
| 3288 int hpos; | |
| 3289 { | |
| 3290 struct frame *f = XFRAME (w->frame); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3291 |
| 25012 | 3292 xassert (!FRAME_WINDOW_P (f)); |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3293 hpos += WINDOW_LEFT_EDGE_COL (w); |
| 25012 | 3294 return hpos; |
| 314 | 3295 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3296 |
| 25012 | 3297 #endif /* GLYPH_DEBUG */ |
| 3298 | |
| 3299 | |
| 314 | 3300 |
| 25012 | 3301 /********************************************************************** |
| 3302 Redrawing Frames | |
| 3303 **********************************************************************/ | |
| 3304 | |
| 3305 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
|
3306 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
|
3307 (frame) |
| 25012 | 3308 Lisp_Object frame; |
| 3309 { | |
| 3310 struct frame *f; | |
| 3311 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3312 CHECK_LIVE_FRAME (frame); |
| 25012 | 3313 f = XFRAME (frame); |
| 3314 | |
| 3315 /* Ignore redraw requests, if frame has no glyphs yet. | |
| 3316 (Implementation note: It still has to be checked why we are | |
| 3317 called so early here). */ | |
| 3318 if (!glyphs_initialized_initially_p) | |
| 3319 return Qnil; | |
| 3320 | |
| 3321 update_begin (f); | |
|
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3322 if (FRAME_MSDOS_P (f)) |
| 25012 | 3323 set_terminal_modes (); |
| 3324 clear_frame (); | |
| 3325 clear_current_matrices (f); | |
| 3326 update_end (f); | |
| 3327 fflush (stdout); | |
| 3328 windows_or_buffers_changed++; | |
| 3329 /* Mark all windows as inaccurate, so that every window will have | |
| 3330 its redisplay done. */ | |
| 3331 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
| 3332 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
| 3333 f->garbaged = 0; | |
| 3334 return Qnil; | |
| 3335 } | |
| 3336 | |
| 3337 | |
| 3338 /* Redraw frame F. This is nothing more than a call to the Lisp | |
| 3339 function redraw-frame. */ | |
| 3340 | |
| 3341 void | |
| 3342 redraw_frame (f) | |
| 3343 struct frame *f; | |
| 3344 { | |
| 3345 Lisp_Object frame; | |
| 3346 XSETFRAME (frame, f); | |
| 3347 Fredraw_frame (frame); | |
| 3348 } | |
| 3349 | |
| 3350 | |
| 3351 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
|
3352 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
|
3353 () |
| 25012 | 3354 { |
| 3355 Lisp_Object tail, frame; | |
| 3356 | |
| 3357 FOR_EACH_FRAME (tail, frame) | |
| 3358 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
| 3359 Fredraw_frame (frame); | |
| 3360 | |
| 3361 return Qnil; | |
| 3362 } | |
| 3363 | |
| 3364 | |
| 3365 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
| 3366 visible frames marked as garbaged. */ | |
| 3367 | |
| 3368 void | |
| 3369 redraw_garbaged_frames () | |
| 3370 { | |
| 3371 Lisp_Object tail, frame; | |
| 3372 | |
| 3373 FOR_EACH_FRAME (tail, frame) | |
| 3374 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
| 3375 && FRAME_GARBAGED_P (XFRAME (frame))) | |
| 3376 Fredraw_frame (frame); | |
| 3377 } | |
| 3378 | |
| 3379 | |
| 3380 | |
| 3381 /*********************************************************************** | |
| 3382 Direct Operations | |
| 3383 ***********************************************************************/ | |
| 3384 | |
| 3385 /* Try to update display and current glyph matrix directly. | |
| 3386 | |
| 3387 This function is called after a character G has been inserted into | |
| 3388 current_buffer. It tries to update the current glyph matrix and | |
| 3389 perform appropriate screen output to reflect the insertion. If it | |
| 3390 succeeds, the global flag redisplay_performed_directly_p will be | |
| 3391 set to 1, and thereby prevent the more costly general redisplay | |
| 3392 from running (see redisplay_internal). | |
| 3393 | |
| 3394 This function is not called for `hairy' character insertions. | |
| 3395 In particular, it is not called when after or before change | |
| 3396 functions exist, like they are used by font-lock. See keyboard.c | |
| 3397 for details where this function is called. */ | |
| 314 | 3398 |
| 3399 int | |
| 3400 direct_output_for_insert (g) | |
| 3401 int g; | |
| 3402 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3403 register struct frame *f = SELECTED_FRAME (); |
| 25012 | 3404 struct window *w = XWINDOW (selected_window); |
| 3405 struct it it, it2; | |
| 3406 struct glyph_row *glyph_row; | |
| 3407 struct glyph *glyphs, *glyph, *end; | |
| 3408 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
|
3409 /* Non-null means that redisplay of W is based on window matrices. */ |
| 25012 | 3410 int window_redisplay_p = FRAME_WINDOW_P (f); |
| 3411 /* Non-null means we are in overwrite mode. */ | |
| 3412 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
| 3413 int added_width; | |
| 3414 struct text_pos pos; | |
| 3415 int delta, delta_bytes; | |
| 3416 | |
| 3417 /* Not done directly. */ | |
| 3418 redisplay_performed_directly_p = 0; | |
| 3419 | |
| 3420 /* Quickly give up for some common cases. */ | |
| 3421 if (cursor_in_echo_area | |
| 3422 /* Give up if fonts have changed. */ | |
| 3423 || fonts_changed_p | |
| 3424 /* Give up if face attributes have been changed. */ | |
| 3425 || face_change_count | |
| 3426 /* Give up if cursor position not really known. */ | |
| 314 | 3427 || !display_completed |
| 25012 | 3428 /* Give up if buffer appears in two places. */ |
| 314 | 3429 || buffer_shared > 1 |
|
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3430 /* 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
|
3431 minibuffer contents. */ |
|
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3432 || (EQ (selected_window, minibuf_window) |
|
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3433 && EQ (minibuf_window, echo_area_window)) |
| 25012 | 3434 /* Give up for hscrolled mini-buffer because display of the prompt |
| 3435 is handled specially there (see display_line). */ | |
| 3436 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
| 3437 /* Give up if overwriting in the middle of a line. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3438 || (overwrite_p |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3439 && PT != ZV |
| 25012 | 3440 && FETCH_BYTE (PT) != '\n') |
| 3441 /* Give up for tabs and line ends. */ | |
| 3442 || g == '\t' | |
| 3443 || g == '\n' | |
| 3444 || g == '\r' | |
| 3445 /* Give up if unable to display the cursor in the window. */ | |
| 3446 || 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
|
3447 /* 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
|
3448 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
|
3449 || !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
|
3450 || !NILP (echo_area_buffer[1]) |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3451 || (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
|
3452 /* 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
|
3453 lines would change. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3454 (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
|
3455 || 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
|
3456 /* 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
|
3457 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
|
3458 have to be redisplayed. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3459 || glyph_row->overlapping_p |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3460 || glyph_row->overlapped_p)) |
| 25012 | 3461 /* Can't do it for partial width windows on terminal frames |
| 3462 because we can't clear to eol in such a window. */ | |
| 3463 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
| 3464 return 0; | |
| 3465 | |
|
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3466 /* 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
|
3467 at the end of a line. */ |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3468 if (!char_ins_del_ok) |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3469 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
|
3470 return 0; |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3471 |
| 25012 | 3472 /* Set up a display iterator structure for W. Glyphs will be |
| 3473 produced in scratch_glyph_row. Current position is W's cursor | |
| 3474 position. */ | |
| 3475 clear_glyph_row (&scratch_glyph_row); | |
| 3476 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
|
3477 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
| 25012 | 3478 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
| 3479 DEFAULT_FACE_ID); | |
| 3480 | |
| 3481 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
|
3482 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
|
3483 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3484 |
| 25012 | 3485 /* Give up if highlighting trailing whitespace and we have trailing |
| 3486 whitespace in glyph_row. We would have to remove the trailing | |
| 3487 whitespace face in that case. */ | |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3488 if (!NILP (Vshow_trailing_whitespace) |
| 25012 | 3489 && glyph_row->used[TEXT_AREA]) |
| 3490 { | |
| 3491 struct glyph *last; | |
| 3492 | |
| 3493 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
| 3494 if (last->type == STRETCH_GLYPH | |
| 3495 || (last->type == CHAR_GLYPH | |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3496 && last->u.ch == ' ')) |
| 25012 | 3497 return 0; |
| 3498 } | |
| 3499 | |
| 3500 /* Give up if there are overlay strings at pos. This would fail | |
| 3501 if the overlay string has newlines in it. */ | |
| 3502 if (STRINGP (it.string)) | |
| 3503 return 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3504 |
| 25012 | 3505 it.hpos = w->cursor.hpos; |
| 3506 it.vpos = w->cursor.vpos; | |
| 3507 it.current_x = w->cursor.x + it.first_visible_x; | |
| 3508 it.current_y = w->cursor.y; | |
| 3509 it.end_charpos = PT; | |
| 3510 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
|
3511 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
| 25012 | 3512 |
| 3513 /* More than one display element may be returned for PT - 1 if | |
| 3514 (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
|
3515 `^C', or (ii) it has a display table entry, or (iii) it's a |
| 25012 | 3516 combination of both. */ |
| 3517 delta = delta_bytes = 0; | |
| 3518 while (get_next_display_element (&it)) | |
| 3519 { | |
| 3520 PRODUCE_GLYPHS (&it); | |
| 3521 | |
| 3522 /* Give up if glyph doesn't fit completely on the line. */ | |
| 3523 if (it.current_x >= it.last_visible_x) | |
| 3524 return 0; | |
| 3525 | |
| 3526 /* Give up if new glyph has different ascent or descent than | |
| 3527 the original row, or if it is not a character glyph. */ | |
| 3528 if (glyph_row->ascent != it.ascent | |
| 3529 || 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
|
3530 || glyph_row->phys_ascent != it.phys_ascent |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3531 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
| 25012 | 3532 || it.what != IT_CHARACTER) |
| 3533 return 0; | |
| 3534 | |
| 3535 delta += 1; | |
| 3536 delta_bytes += it.len; | |
|
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3537 set_iterator_to_next (&it, 1); |
| 25012 | 3538 } |
| 3539 | |
| 3540 /* Give up if we hit the right edge of the window. We would have | |
| 3541 to insert truncation or continuation glyphs. */ | |
| 3542 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
| 3543 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
| 314 | 3544 return 0; |
| 3545 | |
| 25012 | 3546 /* Give up if there is a \t following in the line. */ |
| 3547 it2 = it; | |
| 3548 it2.end_charpos = ZV; | |
| 3549 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
| 3550 while (get_next_display_element (&it2) | |
| 3551 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
| 3552 { | |
| 3553 if (it2.c == '\t') | |
| 3554 return 0; | |
|
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3555 set_iterator_to_next (&it2, 1); |
| 25012 | 3556 } |
| 3557 | |
| 3558 /* Number of new glyphs produced. */ | |
| 3559 n = it.glyph_row->used[TEXT_AREA]; | |
| 3560 | |
| 3561 /* Start and end of glyphs in original row. */ | |
| 3562 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
| 3563 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
| 3564 | |
| 3565 /* Make room for new glyphs, then insert them. */ | |
| 3566 xassert (end - glyphs - n >= 0); | |
|
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3567 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
|
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3568 (end - glyphs - n) * sizeof (*end)); |
| 25012 | 3569 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
| 3570 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
| 3571 end - glyph_row->glyphs[TEXT_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3572 |
| 25012 | 3573 /* Compute new line width. */ |
| 3574 glyph = glyph_row->glyphs[TEXT_AREA]; | |
| 3575 end = glyph + glyph_row->used[TEXT_AREA]; | |
| 3576 glyph_row->pixel_width = glyph_row->x; | |
| 3577 while (glyph < end) | |
| 3578 { | |
| 3579 glyph_row->pixel_width += glyph->pixel_width; | |
| 3580 ++glyph; | |
| 3581 } | |
| 3582 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3583 /* Increment buffer positions for glyphs following the newly |
| 25012 | 3584 inserted ones. */ |
| 3585 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
|
3586 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
| 25012 | 3587 glyph->charpos += delta; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3588 |
| 25012 | 3589 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
| 3590 { | |
| 3591 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
| 3592 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
| 3593 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3594 |
| 25012 | 3595 /* 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
|
3596 increment_matrix_positions (w->current_matrix, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3597 w->cursor.vpos + 1, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3598 w->current_matrix->nrows, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3599 delta, delta_bytes); |
| 25012 | 3600 |
| 3601 glyph_row->contains_overlapping_glyphs_p | |
| 3602 |= it.glyph_row->contains_overlapping_glyphs_p; | |
| 3603 | |
|
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3604 glyph_row->displays_text_p = 1; |
|
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3605 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
|
3606 XFASTINT (w->window_end_vpos))); |
|
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3607 |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3608 if (!NILP (Vshow_trailing_whitespace)) |
| 25012 | 3609 highlight_trailing_whitespace (it.f, glyph_row); |
| 3610 | |
| 3611 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
| 3612 In the middle, we have to insert glyphs. Note that this is now | |
| 3613 implemented for X frames. The implementation uses updated_window | |
| 3614 and updated_row. */ | |
| 3615 updated_row = glyph_row; | |
|
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3616 updated_area = TEXT_AREA; |
| 25012 | 3617 update_begin (f); |
| 3618 if (rif) | |
| 3619 { | |
| 3620 rif->update_window_begin_hook (w); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3621 |
|
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3622 if (glyphs == end - n |
|
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3623 /* 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
|
3624 || (glyphs == end - n - 1 |
|
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3625 && (end - n)->charpos <= 0)) |
| 25012 | 3626 rif->write_glyphs (glyphs, n); |
| 3627 else | |
| 3628 rif->insert_glyphs (glyphs, n); | |
| 3629 } | |
| 3630 else | |
| 3631 { | |
| 3632 if (glyphs == end - n) | |
| 3633 write_glyphs (glyphs, n); | |
| 3634 else | |
| 3635 insert_glyphs (glyphs, n); | |
| 3636 } | |
| 3637 | |
| 3638 w->cursor.hpos += n; | |
| 3639 w->cursor.x = it.current_x - it.first_visible_x; | |
| 3640 xassert (w->cursor.hpos >= 0 | |
| 3641 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
| 3642 | |
| 3643 /* How to set the cursor differs depending on whether we are | |
| 3644 using a frame matrix or a window matrix. Note that when | |
| 3645 a frame matrix is used, cursor_to expects frame coordinates, | |
| 3646 and the X and Y parameters are not used. */ | |
| 3647 if (window_redisplay_p) | |
| 3648 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
| 3649 w->cursor.y, w->cursor.x); | |
| 3650 else | |
| 3651 { | |
| 3652 int x, y; | |
| 3653 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
|
3654 + (INTEGERP (w->left_margin_cols) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3655 ? XFASTINT (w->left_margin_cols) |
| 25012 | 3656 : 0)); |
| 3657 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
| 3658 cursor_to (y, x); | |
| 3659 } | |
| 3660 | |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3661 #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
|
3662 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
|
3663 #endif |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3664 |
| 25012 | 3665 if (rif) |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3666 rif->update_window_end_hook (w, 1, 0); |
| 25012 | 3667 update_end (f); |
| 3668 updated_row = NULL; | |
| 3669 fflush (stdout); | |
| 3670 | |
| 3671 TRACE ((stderr, "direct output for insert\n")); | |
|
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3672 mark_window_display_accurate (it.window, 1); |
| 25012 | 3673 redisplay_performed_directly_p = 1; |
| 314 | 3674 return 1; |
| 3675 } | |
| 3676 | |
| 25012 | 3677 |
| 3678 /* Perform a direct display update for moving PT by N positions | |
| 3679 left or right. N < 0 means a movement backwards. This function | |
| 3680 is currently only called for N == 1 or N == -1. */ | |
| 3681 | |
| 314 | 3682 int |
| 3683 direct_output_forward_char (n) | |
| 3684 int n; | |
| 3685 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3686 struct frame *f = SELECTED_FRAME (); |
| 25012 | 3687 struct window *w = XWINDOW (selected_window); |
| 3688 struct glyph_row *row; | |
| 3689 | |
|
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3690 /* 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
|
3691 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
|
3692 current_buffer, PT)) |
|
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3693 return 0; |
|
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3694 |
| 25012 | 3695 /* Give up if face attributes have been changed. */ |
| 3696 if (face_change_count) | |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3697 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3698 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3699 /* Give up if current matrix is not up to date or we are |
| 25012 | 3700 displaying a message. */ |
| 3701 if (!display_completed || cursor_in_echo_area) | |
| 3702 return 0; | |
| 3703 | |
| 3704 /* Give up if the buffer's direction is reversed. */ | |
| 3705 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
| 314 | 3706 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
|
3707 |
|
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3708 /* 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
|
3709 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
|
3710 return 0; |
|
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3711 |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3712 /* Can't use direct output if highlighting trailing whitespace. */ |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3713 if (!NILP (Vshow_trailing_whitespace)) |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3714 return 0; |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3715 |
|
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3716 /* 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
|
3717 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
|
3718 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
|
3719 return 0; |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3720 |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3721 /* 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
|
3722 minibuffer contents. */ |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3723 if (XWINDOW (minibuf_window) == w |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3724 && EQ (minibuf_window, echo_area_window)) |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3725 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3726 |
|
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3727 /* 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
|
3728 if (w->cursor.vpos < 0) |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3729 return 0; |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3730 |
| 25012 | 3731 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
| 3732 | |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3733 /* 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
|
3734 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
|
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3735 || 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
|
3736 return 0; |
|
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3737 |
| 25012 | 3738 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
|
3739 |
| 25012 | 3740 w->last_cursor = w->cursor; |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3741 XSETFASTINT (w->last_point, PT); |
| 25012 | 3742 |
| 3743 xassert (w->cursor.hpos >= 0 | |
| 3744 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3745 |
| 25012 | 3746 if (FRAME_WINDOW_P (f)) |
| 3747 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
| 3748 w->cursor.y, w->cursor.x); | |
| 3749 else | |
| 3750 { | |
| 3751 int x, y; | |
| 3752 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
|
3753 + (INTEGERP (w->left_margin_cols) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3754 ? XFASTINT (w->left_margin_cols) |
| 25012 | 3755 : 0)); |
| 3756 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
| 3757 cursor_to (y, x); | |
| 3758 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3759 |
| 314 | 3760 fflush (stdout); |
| 25012 | 3761 redisplay_performed_directly_p = 1; |
| 314 | 3762 return 1; |
| 3763 } | |
| 25012 | 3764 |
| 3765 | |
| 314 | 3766 |
| 25012 | 3767 /*********************************************************************** |
| 3768 Frame Update | |
| 3769 ***********************************************************************/ | |
| 3770 | |
| 3771 /* Update frame F based on the data in desired matrices. | |
| 3772 | |
| 3773 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
| 3774 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
| 3775 scrolling. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3776 |
| 25012 | 3777 Value is non-zero if redisplay was stopped due to pending input. */ |
| 314 | 3778 |
| 3779 int | |
| 25012 | 3780 update_frame (f, force_p, inhibit_hairy_id_p) |
| 3781 struct frame *f; | |
| 3782 int force_p; | |
| 3783 int inhibit_hairy_id_p; | |
| 3784 { | |
| 3785 /* 1 means display has been paused because of pending input. */ | |
| 3786 int paused_p; | |
| 3787 struct window *root_window = XWINDOW (f->root_window); | |
| 3788 | |
| 3789 if (FRAME_WINDOW_P (f)) | |
| 3790 { | |
| 3791 /* We are working on window matrix basis. All windows whose | |
| 3792 flag must_be_updated_p is set have to be updated. */ | |
| 3793 | |
| 3794 /* Record that we are not working on frame matrices. */ | |
| 3795 set_frame_matrix_frame (NULL); | |
| 3796 | |
| 3797 /* Update all windows in the window tree of F, maybe stopping | |
| 3798 when pending input is detected. */ | |
| 3799 update_begin (f); | |
| 3800 | |
| 3801 /* Update the menu bar on X frames that don't have toolkit | |
| 3802 support. */ | |
| 3803 if (WINDOWP (f->menu_bar_window)) | |
| 3804 update_window (XWINDOW (f->menu_bar_window), 1); | |
| 3805 | |
| 3806 /* 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
|
3807 if (WINDOWP (f->tool_bar_window)) |
| 25012 | 3808 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3809 struct window *w = XWINDOW (f->tool_bar_window); |
| 25012 | 3810 |
| 3811 /* Update tool-bar window. */ | |
| 3812 if (w->must_be_updated_p) | |
| 3813 { | |
|
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
|
3814 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
|
3815 |
| 25012 | 3816 update_window (w, 1); |
| 3817 w->must_be_updated_p = 0; | |
| 3818 | |
| 3819 /* Swap tool-bar strings. We swap because we want to | |
| 3820 reuse strings. */ | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3821 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
|
3822 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
|
3823 f->desired_tool_bar_string = tem; |
| 25012 | 3824 } |
| 3825 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3826 |
| 25012 | 3827 |
| 3828 /* Update windows. */ | |
| 3829 paused_p = update_window_tree (root_window, force_p); | |
| 3830 update_end (f); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3831 |
|
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3832 /* This flush is a performance bottleneck under X, |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3833 and it doesn't seem to be necessary anyway (in general). |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3834 It is necessary when resizing the window with the mouse, or |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3835 at least the fringes are not redrawn in a timely manner. ++kfs */ |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3836 if (f->force_flush_display_p) |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3837 { |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3838 rif->flush_display (f); |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3839 f->force_flush_display_p = 0; |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3840 } |
| 25012 | 3841 } |
| 3842 else | |
| 3843 { | |
| 3844 /* We are working on frame matrix basis. Set the frame on whose | |
| 3845 frame matrix we operate. */ | |
| 3846 set_frame_matrix_frame (f); | |
| 3847 | |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3848 /* Build F's desired matrix from window matrices. */ |
| 25012 | 3849 build_frame_matrix (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3850 |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3851 /* Update the display */ |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3852 update_begin (f); |
| 25012 | 3853 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
|
3854 update_end (f); |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3855 |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3856 if (termscript) |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3857 fflush (termscript); |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3858 fflush (stdout); |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3859 |
| 25012 | 3860 /* 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
|
3861 #if GLYPH_DEBUG |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3862 check_window_matrix_pointers (root_window); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3863 add_frame_display_history (f, paused_p); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3864 #endif |
| 25012 | 3865 } |
| 3866 | |
| 3867 /* Reset flags indicating that a window should be updated. */ | |
| 3868 set_window_update_flags (root_window, 0); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3869 |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3870 display_completed = !paused_p; |
| 25012 | 3871 return paused_p; |
| 3872 } | |
| 3873 | |
| 3874 | |
| 3875 | |
| 3876 /************************************************************************ | |
| 3877 Window-based updates | |
| 3878 ************************************************************************/ | |
| 3879 | |
| 3880 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
| 3881 don't stop updating when input is pending. */ | |
| 3882 | |
| 3883 static int | |
| 3884 update_window_tree (w, force_p) | |
| 3885 struct window *w; | |
| 3886 int force_p; | |
| 3887 { | |
| 3888 int paused_p = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3889 |
| 25012 | 3890 while (w && !paused_p) |
| 3891 { | |
| 3892 if (!NILP (w->hchild)) | |
| 3893 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
| 3894 else if (!NILP (w->vchild)) | |
| 3895 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
| 3896 else if (w->must_be_updated_p) | |
| 3897 paused_p |= update_window (w, force_p); | |
| 3898 | |
| 3899 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 3900 } | |
| 3901 | |
| 3902 return paused_p; | |
| 3903 } | |
| 3904 | |
| 3905 | |
| 3906 /* Update window W if its flag must_be_updated_p is non-zero. If | |
| 3907 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
| 3908 | |
| 3909 void | |
| 3910 update_single_window (w, force_p) | |
| 3911 struct window *w; | |
| 3912 int force_p; | |
| 3913 { | |
| 3914 if (w->must_be_updated_p) | |
| 3915 { | |
| 3916 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 3917 | |
| 3918 /* Record that this is not a frame-based redisplay. */ | |
| 3919 set_frame_matrix_frame (NULL); | |
| 3920 | |
| 3921 /* Update W. */ | |
| 3922 update_begin (f); | |
| 3923 update_window (w, force_p); | |
| 3924 update_end (f); | |
| 3925 | |
| 3926 /* Reset flag in W. */ | |
| 3927 w->must_be_updated_p = 0; | |
| 3928 } | |
| 3929 } | |
| 3930 | |
| 3931 | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3932 /* 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
|
3933 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
|
3934 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3935 static void |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3936 redraw_overlapped_rows (w, yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3937 struct window *w; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3938 int yb; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3939 { |
|
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3940 int i; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3941 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3942 /* 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
|
3943 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
|
3944 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
|
3945 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
|
3946 current rows is 0. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3947 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
|
3948 { |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3949 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
|
3950 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3951 if (!row->enabled_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3952 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3953 else if (row->mode_line_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3954 continue; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3955 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3956 if (row->overlapped_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3957 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3958 enum glyph_row_area area; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3959 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3960 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
|
3961 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3962 updated_row = row; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3963 updated_area = area; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3964 rif->cursor_to (i, 0, row->y, area == TEXT_AREA ? row->x : 0); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3965 if (row->used[area]) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3966 rif->write_glyphs (row->glyphs[area], row->used[area]); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3967 rif->clear_end_of_line (-1); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3968 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3969 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3970 row->overlapped_p = 0; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3971 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3972 |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3973 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3974 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3975 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3976 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3977 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3978 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3979 /* Redraw lines from the current matrix of window W that overlap |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3980 others. YB is bottom-most y-position in W. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3981 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3982 static void |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3983 redraw_overlapping_rows (w, yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3984 struct window *w; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3985 int yb; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3986 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3987 int i, bottom_y; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3988 struct glyph_row *row; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3989 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3990 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
|
3991 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3992 row = w->current_matrix->rows + i; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3993 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3994 if (!row->enabled_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3995 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3996 else if (row->mode_line_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3997 continue; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3998 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3999 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4000 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4001 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
|
4002 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4003 if (row->used[LEFT_MARGIN_AREA]) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4004 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4005 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4006 if (row->used[TEXT_AREA]) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4007 rif->fix_overlapping_area (w, row, TEXT_AREA); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4008 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4009 if (row->used[RIGHT_MARGIN_AREA]) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4010 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4011 |
|
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
|
4012 /* Record in neighbour rows that ROW overwrites part of their |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4013 display. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4014 if (row->phys_ascent > row->ascent && i > 0) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4015 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4016 if ((row->phys_height - row->phys_ascent |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4017 > row->height - row->ascent) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4018 && bottom_y < yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4019 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4020 } |
|
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 if (bottom_y >= yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4023 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4024 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4025 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4026 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4027 |
|
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4028 #ifdef GLYPH_DEBUG |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4029 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4030 /* 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
|
4031 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
|
4032 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4033 void |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4034 check_current_matrix_flags (w) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4035 struct window *w; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4036 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4037 int last_seen_p = 0; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4038 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
|
4039 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4040 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
|
4041 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4042 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
|
4043 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
|
4044 last_seen_p = 1; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4045 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
|
4046 abort (); |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4047 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4048 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4049 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4050 #endif /* GLYPH_DEBUG */ |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4051 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4052 |
| 25012 | 4053 /* Update display of window W. FORCE_P non-zero means that we should |
| 4054 not stop when detecting pending input. */ | |
| 4055 | |
| 4056 static int | |
| 4057 update_window (w, force_p) | |
| 4058 struct window *w; | |
| 4059 int force_p; | |
| 4060 { | |
| 4061 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
| 4062 int paused_p; | |
| 4063 int preempt_count = baud_rate / 2400 + 1; | |
| 4064 extern int input_pending; | |
|
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4065 extern Lisp_Object do_mouse_tracking; |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4066 #if GLYPH_DEBUG |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4067 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4068 #endif |
| 25012 | 4069 |
| 4070 /* Check that W's frame doesn't have glyph matrices. */ | |
| 4071 xassert (FRAME_WINDOW_P (f)); | |
| 4072 xassert (updating_frame != NULL); | |
| 4073 | |
| 4074 /* Check pending input the first time so that we can quickly return. */ | |
| 4075 if (redisplay_dont_pause) | |
| 4076 force_p = 1; | |
| 4077 else | |
| 4078 detect_input_pending (); | |
| 4079 | |
| 4080 /* If forced to complete the update, or if no input is pending, do | |
| 4081 the update. */ | |
|
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4082 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
| 25012 | 4083 { |
| 4084 struct glyph_row *row, *end; | |
| 4085 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
|
4086 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
|
4087 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
| 25012 | 4088 |
| 4089 rif->update_window_begin_hook (w); | |
| 4090 yb = window_text_bottom_y (w); | |
| 4091 | |
|
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
|
4092 /* 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
|
4093 Adjust y-positions of other rows by the header line height. */ |
| 25012 | 4094 row = desired_matrix->rows; |
| 4095 end = row + desired_matrix->nrows - 1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4096 |
| 25012 | 4097 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
|
4098 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4099 header_line_row = row; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4100 ++row; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4101 } |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4102 else |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4103 header_line_row = NULL; |
| 25012 | 4104 |
| 4105 /* Update the mode line, if necessary. */ | |
| 4106 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
| 4107 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
| 4108 { | |
| 4109 mode_line_row->y = yb; | |
| 4110 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
|
4111 desired_matrix), |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4112 &mouse_face_overwritten_p); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4113 changed_p = 1; |
| 25012 | 4114 } |
| 4115 | |
| 4116 /* Find first enabled row. Optimizations in redisplay_internal | |
| 4117 may lead to an update with only one row enabled. There may | |
| 4118 be also completely empty matrices. */ | |
| 4119 while (row < end && !row->enabled_p) | |
| 4120 ++row; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4121 |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4122 /* Try reusing part of the display by copying. */ |
| 25012 | 4123 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
|
4124 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4125 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
|
4126 if (rc < 0) |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4127 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4128 /* 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
|
4129 paused_p = 0; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4130 goto set_cursor; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4131 } |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4132 else if (rc > 0) |
|
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4133 { |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4134 /* We've scrolled the display. */ |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4135 force_p = 1; |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4136 changed_p = 1; |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4137 } |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4138 } |
| 25012 | 4139 |
| 4140 /* 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
|
4141 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
|
4142 if (row->enabled_p) |
| 25012 | 4143 { |
| 4144 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
| 4145 int i; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4146 |
|
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
|
4147 /* We'll have to play a little bit with when to |
| 25012 | 4148 detect_input_pending. If it's done too often, |
| 4149 scrolling large windows with repeated scroll-up | |
| 4150 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
|
4151 if (!force_p && ++n_updated % preempt_count == 0) |
| 25012 | 4152 detect_input_pending (); |
| 4153 | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4154 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
|
4155 &mouse_face_overwritten_p); |
| 25012 | 4156 |
| 4157 /* Mark all rows below the last visible one in the current | |
| 4158 matrix as invalid. This is necessary because of | |
| 4159 variable line heights. Consider the case of three | |
| 4160 successive redisplays, where the first displays 5 | |
| 4161 lines, the second 3 lines, and the third 5 lines again. | |
| 4162 If the second redisplay wouldn't mark rows in the | |
| 4163 current matrix invalid, the third redisplay might be | |
| 4164 tempted to optimize redisplay based on lines displayed | |
| 4165 in the first redisplay. */ | |
| 4166 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
| 4167 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
| 4168 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
| 4169 } | |
| 4170 | |
| 4171 /* Was display preempted? */ | |
| 4172 paused_p = row < end; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4173 |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4174 set_cursor: |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4175 |
|
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4176 /* 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
|
4177 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
|
4178 that can be scrolled. */ |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4179 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
|
4180 { |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4181 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
|
4182 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
|
4183 changed_p = 1; |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4184 } |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4185 |
|
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Jan?k <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4186 /* Fix the appearance of overlapping/overlapped rows. */ |
| 25012 | 4187 if (!paused_p && !w->pseudo_window_p) |
| 4188 { | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4189 if (changed_p && rif->fix_overlapping_area) |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4190 { |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4191 redraw_overlapped_rows (w, yb); |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4192 redraw_overlapping_rows (w, yb); |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4193 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4194 |
| 25012 | 4195 /* Make cursor visible at cursor position of W. */ |
| 4196 set_window_cursor_after_update (w); | |
| 4197 | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4198 #if 0 /* Check that current matrix invariants are satisfied. This is |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4199 for debugging only. See the comment of check_matrix_invariants. */ |
| 25012 | 4200 IF_DEBUG (check_matrix_invariants (w)); |
| 4201 #endif | |
| 4202 } | |
| 4203 | |
| 4204 #if GLYPH_DEBUG | |
| 4205 /* Remember the redisplay method used to display the matrix. */ | |
| 4206 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
| 4207 #endif | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4208 |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4209 #ifdef HAVE_WINDOW_SYSTEM |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4210 update_window_fringes (w, 0); |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4211 #endif |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4212 |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4213 /* End the update of window W. Don't set the cursor if we |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4214 paused updating the display because in this case, |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4215 set_window_cursor_after_update hasn't been called, and |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4216 output_cursor doesn't contain the cursor location. */ |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4217 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
| 25012 | 4218 } |
| 4219 else | |
| 4220 paused_p = 1; | |
| 4221 | |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4222 #if GLYPH_DEBUG |
|
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4223 /* check_current_matrix_flags (w); */ |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4224 add_window_display_history (w, w->current_matrix->method, paused_p); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4225 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4226 |
| 25012 | 4227 clear_glyph_matrix (desired_matrix); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4228 |
| 25012 | 4229 return paused_p; |
| 4230 } | |
| 4231 | |
| 4232 | |
| 4233 /* Update the display of area AREA in window W, row number VPOS. | |
| 4234 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
| 4235 | |
| 4236 static void | |
| 4237 update_marginal_area (w, area, vpos) | |
| 4238 struct window *w; | |
| 4239 int area, vpos; | |
| 4240 { | |
| 4241 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
| 4242 | |
| 4243 /* Let functions in xterm.c know what area subsequent X positions | |
| 4244 will be relative to. */ | |
| 4245 updated_area = area; | |
| 4246 | |
| 4247 /* Set cursor to start of glyphs, write them, and clear to the end | |
| 4248 of the area. I don't think that something more sophisticated is | |
| 4249 necessary here, since marginal areas will not be the default. */ | |
| 4250 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
| 4251 if (desired_row->used[area]) | |
| 4252 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
| 4253 rif->clear_end_of_line (-1); | |
| 4254 } | |
| 4255 | |
| 4256 | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4257 /* 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
|
4258 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
|
4259 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4260 static int |
| 25012 | 4261 update_text_area (w, vpos) |
| 4262 struct window *w; | |
| 4263 int vpos; | |
| 314 | 4264 { |
| 25012 | 4265 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
| 4266 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4267 int changed_p = 0; |
| 25012 | 4268 |
| 4269 /* Let functions in xterm.c know what area subsequent X positions | |
| 4270 will be relative to. */ | |
| 4271 updated_area = TEXT_AREA; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4272 |
| 25012 | 4273 /* If rows are at different X or Y, or rows have different height, |
| 4274 or the current row is marked invalid, write the entire line. */ | |
| 4275 if (!current_row->enabled_p | |
| 4276 || desired_row->y != current_row->y | |
| 4277 || desired_row->ascent != current_row->ascent | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4278 || 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
|
4279 || desired_row->phys_height != current_row->phys_height |
| 25012 | 4280 || 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
|
4281 || current_row->overlapped_p |
|
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4282 || current_row->mouse_face_p |
| 25012 | 4283 || current_row->x != desired_row->x) |
| 4284 { | |
| 4285 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
|
4286 |
| 25012 | 4287 if (desired_row->used[TEXT_AREA]) |
| 4288 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
| 4289 desired_row->used[TEXT_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4290 |
| 25012 | 4291 /* Clear to end of window. */ |
| 4292 rif->clear_end_of_line (-1); | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4293 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
|
4294 |
|
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4295 /* 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
|
4296 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
|
4297 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
|
4298 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
|
4299 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
|
4300 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
|
4301 redisplay. */ |
|
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4302 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
|
4303 w->phys_cursor_on_p = 0; |
| 25012 | 4304 } |
| 4305 else | |
| 4306 { | |
| 4307 int stop, i, x; | |
| 4308 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
| 4309 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
|
4310 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
|
4311 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
|
4312 |
| 25012 | 4313 /* If the desired row extends its face to the text area end, |
| 4314 make sure we write at least one glyph, so that the face | |
| 4315 extension actually takes place. */ | |
| 35269 | 4316 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) |
|
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4317 --desired_stop_pos; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4318 |
| 25012 | 4319 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
| 4320 i = 0; | |
| 4321 x = desired_row->x; | |
|
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4322 |
|
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4323 /* 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
|
4324 in common. */ |
| 25012 | 4325 while (i < stop) |
| 4326 { | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4327 int can_skip_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4328 |
| 25012 | 4329 /* 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
|
4330 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
|
4331 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
|
4332 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
|
4333 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
|
4334 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
|
4335 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
|
4336 `f' on the screen. */ |
|
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4337 if (overlapping_glyphs_p && i > 0) |
| 25012 | 4338 { |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4339 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
|
4340 int left, right; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4341 |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4342 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
|
4343 &left, &right); |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4344 can_skip_p = right == 0; |
| 25012 | 4345 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4346 |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4347 if (can_skip_p) |
| 25012 | 4348 { |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4349 while (i < stop |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4350 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4351 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4352 x += desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4353 ++desired_glyph, ++current_glyph, ++i; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4354 } |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4355 |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4356 /* 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
|
4357 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
|
4358 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
|
4359 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
|
4360 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
|
4361 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
|
4362 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
|
4363 taken care of by draw_glyphs. */ |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4364 if (overlapping_glyphs_p |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4365 && i > 0 |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4366 && i < current_row->used[TEXT_AREA] |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4367 && (current_row->used[TEXT_AREA] |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4368 != desired_row->used[TEXT_AREA])) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4369 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4370 int left, right; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4371 |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4372 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
|
4373 &left, &right); |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4374 while (left > 0 && i > 0) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4375 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4376 --i, --desired_glyph, --current_glyph; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4377 x -= desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4378 left -= desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4379 } |
| 25012 | 4380 } |
| 4381 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4382 |
| 25012 | 4383 /* Try to avoid writing the entire rest of the desired row |
| 4384 by looking for a resync point. This mainly prevents | |
| 4385 mode line flickering in the case the mode line is in | |
| 4386 fixed-pitch font, which it usually will be. */ | |
| 4387 if (i < desired_row->used[TEXT_AREA]) | |
| 4388 { | |
| 4389 int start_x = x, start_hpos = i; | |
| 4390 struct glyph *start = desired_glyph; | |
| 4391 int current_x = x; | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4392 int skip_first_p = !can_skip_p; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4393 |
| 25012 | 4394 /* Find the next glyph that's equal again. */ |
| 4395 while (i < stop | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4396 && (skip_first_p |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4397 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
| 25012 | 4398 && x == current_x) |
| 4399 { | |
| 4400 x += desired_glyph->pixel_width; | |
| 4401 current_x += current_glyph->pixel_width; | |
| 4402 ++desired_glyph, ++current_glyph, ++i; | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4403 skip_first_p = 0; |
| 25012 | 4404 } |
| 4405 | |
| 4406 if (i == start_hpos || x != current_x) | |
| 4407 { | |
| 4408 i = start_hpos; | |
| 4409 x = start_x; | |
| 4410 desired_glyph = start; | |
| 4411 break; | |
| 4412 } | |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4413 |
| 25012 | 4414 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
| 4415 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
|
4416 changed_p = 1; |
| 25012 | 4417 } |
| 4418 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4419 |
| 25012 | 4420 /* Write the rest. */ |
| 4421 if (i < desired_row->used[TEXT_AREA]) | |
| 4422 { | |
| 4423 rif->cursor_to (vpos, i, desired_row->y, x); | |
| 4424 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
|
4425 changed_p = 1; |
| 25012 | 4426 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4427 |
| 25012 | 4428 /* Maybe clear to end of line. */ |
| 4429 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
| 4430 { | |
| 4431 /* If new row extends to the end of the text area, nothing | |
| 4432 has to be cleared, if and only if we did a write_glyphs | |
| 4433 above. This is made sure by setting desired_stop_pos | |
| 4434 appropriately above. */ | |
| 4435 xassert (i < desired_row->used[TEXT_AREA]); | |
| 4436 } | |
| 4437 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
| 4438 { | |
| 4439 /* If old row extends to the end of the text area, clear. */ | |
| 4440 if (i >= desired_row->used[TEXT_AREA]) | |
| 4441 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
|
4442 desired_row->pixel_width); |
| 25012 | 4443 rif->clear_end_of_line (-1); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4444 changed_p = 1; |
| 25012 | 4445 } |
| 4446 else if (desired_row->pixel_width < current_row->pixel_width) | |
| 4447 { | |
| 4448 /* Otherwise clear to the end of the old row. Everything | |
| 4449 after that position should be clear already. */ | |
| 4450 int x; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4451 |
| 25012 | 4452 if (i >= desired_row->used[TEXT_AREA]) |
| 4453 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
|
4454 desired_row->pixel_width); |
| 25012 | 4455 |
| 4456 /* If cursor is displayed at the end of the line, make sure | |
| 4457 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
| 4458 with which to erase the cursor (because this method | |
| 4459 doesn't work with lbearing/rbearing), so we must do it | |
| 4460 this way. */ | |
| 4461 if (vpos == w->phys_cursor.vpos | |
| 4462 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
| 4463 { | |
| 4464 w->phys_cursor_on_p = 0; | |
| 4465 x = -1; | |
| 4466 } | |
| 4467 else | |
|
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4468 x = current_row->pixel_width; |
| 25012 | 4469 rif->clear_end_of_line (x); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4470 changed_p = 1; |
| 25012 | 4471 } |
| 4472 } | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4473 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4474 return changed_p; |
| 25012 | 4475 } |
| 4476 | |
| 4477 | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4478 /* 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
|
4479 changed. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4480 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4481 static int |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4482 update_window_line (w, vpos, mouse_face_overwritten_p) |
| 25012 | 4483 struct window *w; |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4484 int vpos, *mouse_face_overwritten_p; |
| 25012 | 4485 { |
| 4486 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
| 4487 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4488 int changed_p = 0; |
| 25012 | 4489 |
| 4490 /* Set the row being updated. This is important to let xterm.c | |
| 4491 know what line height values are in effect. */ | |
| 4492 updated_row = desired_row; | |
| 4493 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4494 /* 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
|
4495 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
|
4496 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
|
4497 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
|
4498 if (desired_row->mode_line_p |
|
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4499 || desired_row->visible_height > 0) |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4500 { |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4501 xassert (desired_row->enabled_p); |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4502 |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4503 /* 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
|
4504 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
|
4505 && !NILP (w->left_margin_cols)) |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4506 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4507 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4508 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
|
4509 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4510 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4511 /* Update the display of the text area. */ |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4512 if (update_text_area (w, vpos)) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4513 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4514 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4515 if (current_row->mouse_face_p) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4516 *mouse_face_overwritten_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4517 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4518 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4519 /* 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
|
4520 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
|
4521 && !NILP (w->right_margin_cols)) |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4522 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4523 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4524 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
|
4525 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4526 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4527 /* Draw truncation marks etc. */ |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4528 if (!current_row->enabled_p |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4529 || desired_row->y != current_row->y |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4530 || 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
|
4531 || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p |
|
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
4532 || desired_row->overlay_arrow_p != current_row->overlay_arrow_p |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4533 || current_row->redraw_fringe_bitmaps_p |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4534 || 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
|
4535 || 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
|
4536 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4537 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4538 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
|
4539 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4540 |
| 25012 | 4541 /* Update current_row from desired_row. */ |
| 4542 make_current (w->desired_matrix, w->current_matrix, vpos); | |
| 4543 updated_row = NULL; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4544 return changed_p; |
| 25012 | 4545 } |
| 4546 | |
| 4547 | |
| 4548 /* Set the cursor after an update of window W. This function may only | |
| 4549 be called from update_window. */ | |
| 4550 | |
| 4551 static void | |
| 4552 set_window_cursor_after_update (w) | |
| 4553 struct window *w; | |
| 4554 { | |
| 4555 struct frame *f = XFRAME (w->frame); | |
| 4556 int cx, cy, vpos, hpos; | |
| 4557 | |
| 4558 /* Not intended for frame matrix updates. */ | |
| 4559 xassert (FRAME_WINDOW_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4560 |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4561 if (cursor_in_echo_area |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4562 && !NILP (echo_area_buffer[0]) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4563 /* 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
|
4564 show the cursor for the message instead. */ |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4565 && XWINDOW (minibuf_window) == w |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4566 && EQ (minibuf_window, echo_area_window) |
| 25012 | 4567 /* These cases apply only to the frame that contains |
| 4568 the active mini-buffer window. */ | |
| 4569 && FRAME_HAS_MINIBUF_P (f) | |
| 4570 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
| 4571 { | |
| 4572 cx = cy = vpos = hpos = 0; | |
| 4573 | |
| 4574 if (cursor_in_echo_area >= 0) | |
| 4575 { | |
| 4576 /* If the mini-buffer is several lines high, find the last | |
| 4577 line that has any text on it. Note: either all lines | |
| 4578 are enabled or none. Otherwise we wouldn't be able to | |
| 4579 determine Y. */ | |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4580 struct glyph_row *row, *last_row; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4581 struct glyph *glyph; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4582 int yb = window_text_bottom_y (w); |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4583 |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4584 last_row = NULL; |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4585 row = w->current_matrix->rows; |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4586 while (row->enabled_p |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4587 && (last_row == NULL |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4588 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
| 25012 | 4589 { |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4590 if (row->used[TEXT_AREA] |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4591 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4592 last_row = row; |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4593 ++row; |
| 25012 | 4594 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4595 |
| 25012 | 4596 if (last_row) |
| 4597 { | |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4598 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
|
4599 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
|
4600 |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4601 while (last > start && last->charpos < 0) |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4602 --last; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4603 |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4604 for (glyph = start; glyph < last; ++glyph) |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4605 { |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4606 cx += glyph->pixel_width; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4607 ++hpos; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4608 } |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4609 |
| 25012 | 4610 cy = last_row->y; |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4611 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
| 25012 | 4612 } |
| 4613 } | |
| 4614 } | |
| 4615 else | |
| 4616 { | |
| 4617 cx = w->cursor.x; | |
| 4618 cy = w->cursor.y; | |
| 4619 hpos = w->cursor.hpos; | |
| 4620 vpos = w->cursor.vpos; | |
| 4621 } | |
| 4622 | |
| 4623 /* Window cursor can be out of sync for horizontally split windows. */ | |
| 4624 hpos = max (0, hpos); | |
| 4625 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
| 4626 vpos = max (0, vpos); | |
| 4627 vpos = min (w->current_matrix->nrows - 1, vpos); | |
| 4628 rif->cursor_to (vpos, hpos, cy, cx); | |
| 4629 } | |
| 4630 | |
| 4631 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4632 /* 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
|
4633 tree rooted at W. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4634 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4635 void |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4636 set_window_update_flags (w, on_p) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4637 struct window *w; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4638 int on_p; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4639 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4640 while (w) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4641 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4642 if (!NILP (w->hchild)) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4643 set_window_update_flags (XWINDOW (w->hchild), on_p); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4644 else if (!NILP (w->vchild)) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4645 set_window_update_flags (XWINDOW (w->vchild), on_p); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4646 else |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4647 w->must_be_updated_p = on_p; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4648 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4649 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4650 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4651 } |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4652 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4653 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4654 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4655 /*********************************************************************** |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4656 Window-Based Scrolling |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4657 ***********************************************************************/ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4658 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4659 /* Structure describing rows in scrolling_window. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4660 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4661 struct row_entry |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4662 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4663 /* 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
|
4664 int old_uses, new_uses; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4665 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4666 /* Vpos of row in new matrix. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4667 int new_line_number; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4668 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4669 /* 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
|
4670 int bucket; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4671 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4672 /* The row described by this entry. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4673 struct glyph_row *row; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4674 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4675 /* Hash collision chain. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4676 struct row_entry *next; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4677 }; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4678 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4679 /* 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
|
4680 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
|
4681 that we need a larger one. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4682 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4683 static struct row_entry *row_entry_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4684 static int row_entry_pool_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4685 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4686 /* Index of next free entry in row_entry_pool. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4687 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4688 static int row_entry_idx; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4689 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4690 /* 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
|
4691 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
|
4692 current matrix. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4693 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4694 static struct row_entry **row_table; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4695 static int row_table_size; |
|
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 /* 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
|
4698 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
|
4699 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4700 static struct row_entry **old_lines, **new_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4701 static int old_lines_size, new_lines_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4702 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4703 /* 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
|
4704 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4705 static struct run *run_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4706 static int runs_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4707 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4708 /* A vector of runs of lines found during scrolling. */ |
|
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 static struct run **runs; |
|
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 /* 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
|
4713 of window W. */ |
|
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 static INLINE struct row_entry * |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4716 add_row_entry (w, row) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4717 struct window *w; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4718 struct glyph_row *row; |
|
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 struct row_entry *entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4721 int i = row->hash % row_table_size; |
|
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 entry = row_table[i]; |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4724 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
|
4725 entry = entry->next; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4726 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4727 if (entry == NULL) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4728 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4729 entry = row_entry_pool + row_entry_idx++; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4730 entry->row = row; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4731 entry->old_uses = entry->new_uses = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4732 entry->new_line_number = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4733 entry->bucket = i; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4734 entry->next = row_table[i]; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4735 row_table[i] = entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4736 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4737 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4738 return entry; |
|
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 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4741 |
| 25012 | 4742 /* 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
|
4743 HEADER_LINE_P non-zero means W has a header line. |
| 25012 | 4744 |
| 4745 The algorithm is taken from Communications of the ACM, Apr78 "A | |
| 4746 Technique for Isolating Differences Between Files." It should take | |
| 4747 O(N) time. | |
| 4748 | |
| 4749 A short outline of the steps of the algorithm | |
| 4750 | |
| 4751 1. Skip lines equal at the start and end of both matrices. | |
| 4752 | |
| 4753 2. Enter rows in the current and desired matrix into a symbol | |
| 4754 table, counting how often they appear in both matrices. | |
| 4755 | |
| 4756 3. Rows that appear exactly once in both matrices serve as anchors, | |
| 4757 i.e. we assume that such lines are likely to have been moved. | |
| 4758 | |
| 4759 4. Starting from anchor lines, extend regions to be scrolled both | |
| 4760 forward and backward. | |
| 4761 | |
| 4762 Value is | |
| 4763 | |
| 4764 -1 if all rows were found to be equal. | |
| 4765 0 to indicate that we did not scroll the display, or | |
| 4766 1 if we did scroll. */ | |
| 4767 | |
| 4768 static int | |
| 25546 | 4769 scrolling_window (w, header_line_p) |
| 25012 | 4770 struct window *w; |
| 25546 | 4771 int header_line_p; |
| 25012 | 4772 { |
| 4773 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
| 4774 struct glyph_matrix *current_matrix = w->current_matrix; | |
| 4775 int yb = window_text_bottom_y (w); | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4776 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
|
4777 int nruns, nbytes, n, run_idx; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4778 struct row_entry *entry; |
| 25012 | 4779 |
| 4780 /* 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
|
4781 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
| 25012 | 4782 { |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4783 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
|
4784 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
|
4785 |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4786 if (c->enabled_p |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4787 && d->enabled_p |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4788 && !d->redraw_fringe_bitmaps_p |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4789 && c->y == d->y |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4790 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4791 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4792 && row_equal_p (w, c, d, 1)) |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4793 { |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4794 assign_row (c, d); |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4795 d->enabled_p = 0; |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4796 } |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4797 else |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4798 break; |
| 25012 | 4799 } |
| 4800 | |
| 4801 /* Give up if some rows in the desired matrix are not enabled. */ | |
| 4802 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
| 4803 return -1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4804 |
| 25012 | 4805 first_old = first_new = i; |
| 4806 | |
| 4807 /* Set last_new to the index + 1 of the last enabled row in the | |
| 4808 desired matrix. */ | |
| 4809 i = first_new + 1; | |
| 4810 while (i < desired_matrix->nrows - 1 | |
| 4811 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4812 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
| 25012 | 4813 ++i; |
| 4814 | |
| 4815 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
| 4816 return 0; | |
| 4817 | |
| 4818 last_new = i; | |
| 4819 | |
| 4820 /* Set last_old to the index + 1 of the last enabled row in the | |
| 4821 current matrix. We don't look at the enabled flag here because | |
| 4822 we plan to reuse part of the display even if other parts are | |
| 4823 disabled. */ | |
| 4824 i = first_old + 1; | |
|
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4825 while (i < current_matrix->nrows - 1) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4826 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4827 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
|
4828 if (bottom <= yb) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4829 ++i; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4830 if (bottom >= yb) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4831 break; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4832 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4833 |
| 25012 | 4834 last_old = i; |
| 4835 | |
| 4836 /* Skip over rows equal at the bottom. */ | |
| 4837 i = last_new; | |
| 4838 j = last_old; | |
| 4839 while (i - 1 > first_new | |
| 4840 && j - 1 > first_old | |
| 4841 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
| 4842 && (MATRIX_ROW (current_matrix, i - 1)->y | |
| 4843 == 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
|
4844 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
| 25012 | 4845 && row_equal_p (w, |
| 4846 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
|
4847 MATRIX_ROW (current_matrix, j - 1), 1)) |
| 25012 | 4848 --i, --j; |
| 4849 last_new = i; | |
| 4850 last_old = j; | |
| 4851 | |
| 4852 /* Nothing to do if all rows are equal. */ | |
| 4853 if (last_new == first_new) | |
| 4854 return 0; | |
| 4855 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4856 /* Reallocate vectors, tables etc. if necessary. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4857 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4858 if (current_matrix->nrows > old_lines_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4859 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4860 old_lines_size = current_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4861 nbytes = old_lines_size * sizeof *old_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4862 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4863 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4864 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4865 if (desired_matrix->nrows > new_lines_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4866 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4867 new_lines_size = desired_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4868 nbytes = new_lines_size * sizeof *new_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4869 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4871 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4872 n = desired_matrix->nrows + current_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4873 if (3 * n > row_table_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4874 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4875 row_table_size = next_almost_prime (3 * n); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4876 nbytes = row_table_size * sizeof *row_table; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4877 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4878 bzero (row_table, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4879 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4880 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4881 if (n > row_entry_pool_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4882 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4883 row_entry_pool_size = n; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4884 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4885 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
|
4886 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4887 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4888 if (desired_matrix->nrows > runs_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4889 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4890 runs_size = desired_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4891 nbytes = runs_size * sizeof *runs; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4892 runs = (struct run **) xrealloc (runs, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4893 nbytes = runs_size * sizeof *run_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4894 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4895 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4896 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4897 nruns = run_idx = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4898 row_entry_idx = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4899 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4900 /* 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
|
4901 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
|
4902 |
| 25012 | 4903 for (i = first_old; i < last_old; ++i) |
| 4904 { | |
| 4905 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
| 4906 { | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4907 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
|
4908 old_lines[i] = entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4909 ++entry->old_uses; |
| 25012 | 4910 } |
| 4911 else | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4912 old_lines[i] = NULL; |
| 25012 | 4913 } |
| 4914 | |
| 4915 for (i = first_new; i < last_new; ++i) | |
| 4916 { | |
| 4917 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4918 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
|
4919 ++entry->new_uses; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4920 entry->new_line_number = i; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4921 new_lines[i] = entry; |
| 25012 | 4922 } |
| 4923 | |
| 4924 /* Identify moves based on lines that are unique and equal | |
| 4925 in both matrices. */ | |
| 4926 for (i = first_old; i < last_old;) | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4927 if (old_lines[i] |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4928 && old_lines[i]->old_uses == 1 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4929 && old_lines[i]->new_uses == 1) |
| 25012 | 4930 { |
| 4931 int j, k; | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4932 int new_line = old_lines[i]->new_line_number; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4933 struct run *run = run_pool + run_idx++; |
| 25012 | 4934 |
| 4935 /* Record move. */ | |
| 4936 run->current_vpos = i; | |
| 4937 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
| 4938 run->desired_vpos = new_line; | |
| 4939 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
| 4940 run->nrows = 1; | |
| 4941 run->height = MATRIX_ROW (current_matrix, i)->height; | |
| 4942 | |
| 4943 /* Extend backward. */ | |
| 4944 j = i - 1; | |
| 4945 k = new_line - 1; | |
| 4946 while (j > first_old | |
| 4947 && k > first_new | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4948 && old_lines[j] == new_lines[k]) |
| 25012 | 4949 { |
| 4950 int h = MATRIX_ROW (current_matrix, j)->height; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4951 --run->current_vpos; |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4952 --run->desired_vpos; |
| 25012 | 4953 ++run->nrows; |
| 4954 run->height += h; | |
| 4955 run->desired_y -= h; | |
| 4956 run->current_y -= h; | |
| 4957 --j, --k; | |
| 4958 } | |
| 4959 | |
| 4960 /* Extend forward. */ | |
| 4961 j = i + 1; | |
| 4962 k = new_line + 1; | |
| 4963 while (j < last_old | |
| 4964 && k < last_new | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4965 && old_lines[j] == new_lines[k]) |
| 25012 | 4966 { |
| 4967 int h = MATRIX_ROW (current_matrix, j)->height; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4968 ++run->nrows; |
| 25012 | 4969 run->height += h; |
| 4970 ++j, ++k; | |
| 4971 } | |
| 4972 | |
| 4973 /* Insert run into list of all runs. Order runs by copied | |
| 4974 pixel lines. Note that we record runs that don't have to | |
| 4975 be copied because they are already in place. This is done | |
| 4976 because we can avoid calling update_window_line in this | |
| 4977 case. */ | |
| 4978 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
| 4979 ; | |
|
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
4980 for (k = nruns; k > j; --k) |
| 25012 | 4981 runs[k] = runs[k - 1]; |
| 4982 runs[j] = run; | |
| 4983 ++nruns; | |
| 4984 | |
| 4985 i += run->nrows; | |
| 4986 } | |
| 4987 else | |
| 4988 ++i; | |
| 4989 | |
| 4990 /* Do the moves. Do it in a way that we don't overwrite something | |
| 4991 we want to copy later on. This is not solvable in general | |
| 4992 because there is only one display and we don't have a way to | |
| 4993 exchange areas on this display. Example: | |
| 4994 | |
| 4995 +-----------+ +-----------+ | |
| 4996 | A | | B | | |
| 4997 +-----------+ --> +-----------+ | |
| 4998 | B | | A | | |
| 4999 +-----------+ +-----------+ | |
| 5000 | |
| 5001 Instead, prefer bigger moves, and invalidate moves that would | |
| 5002 copy from where we copied to. */ | |
| 5003 | |
| 5004 for (i = 0; i < nruns; ++i) | |
| 5005 if (runs[i]->nrows > 0) | |
| 5006 { | |
| 5007 struct run *r = runs[i]; | |
| 5008 | |
| 5009 /* Copy on the display. */ | |
| 5010 if (r->current_y != r->desired_y) | |
| 5011 { | |
| 5012 rif->scroll_run_hook (w, r); | |
| 5013 | |
| 5014 /* Invalidate runs that copy from where we copied to. */ | |
| 5015 for (j = i + 1; j < nruns; ++j) | |
| 5016 { | |
| 5017 struct run *p = runs[j]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5018 |
| 25012 | 5019 if ((p->current_y >= r->desired_y |
| 5020 && p->current_y < r->desired_y + r->height) | |
| 5021 || (p->current_y + p->height >= r->desired_y | |
| 5022 && (p->current_y + p->height | |
| 5023 < r->desired_y + r->height))) | |
| 5024 p->nrows = 0; | |
| 5025 } | |
| 5026 } | |
| 5027 | |
| 5028 /* Assign matrix rows. */ | |
| 5029 for (j = 0; j < r->nrows; ++j) | |
| 5030 { | |
| 5031 struct glyph_row *from, *to; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5032 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
|
5033 |
| 25012 | 5034 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
|
5035 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
|
5036 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
|
5037 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
|
5038 && (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
|
5039 || 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
|
5040 || 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
|
5041 || to->right_fringe_face_id != from->right_fringe_face_id |
|
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5042 || to->overlay_arrow_p != from->overlay_arrow_p)) |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5043 from->redraw_fringe_bitmaps_p = 1; |
| 25012 | 5044 assign_row (to, from); |
| 5045 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
|
5046 to->overlapped_p = to_overlapped_p; |
| 25012 | 5047 } |
| 5048 } | |
| 5049 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5050 /* Clear the hash table, for the next time. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5051 for (i = 0; i < row_entry_idx; ++i) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5052 row_table[row_entry_pool[i].bucket] = NULL; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5053 |
|
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5054 /* 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
|
5055 return nruns; |
| 25012 | 5056 } |
| 5057 | |
| 5058 | |
| 5059 | |
| 5060 /************************************************************************ | |
| 5061 Frame-Based Updates | |
| 5062 ************************************************************************/ | |
| 5063 | |
| 5064 /* Update the desired frame matrix of frame F. | |
| 5065 | |
| 5066 FORCE_P non-zero means that the update should not be stopped by | |
| 5067 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
| 5068 should not be tried. | |
| 5069 | |
| 5070 Value is non-zero if update was stopped due to pending input. */ | |
| 5071 | |
| 5072 static int | |
| 5073 update_frame_1 (f, force_p, inhibit_id_p) | |
| 5074 struct frame *f; | |
| 5075 int force_p; | |
| 5076 int inhibit_id_p; | |
| 5077 { | |
| 5078 /* Frame matrices to work on. */ | |
| 5079 struct glyph_matrix *current_matrix = f->current_matrix; | |
| 5080 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
| 5081 int i; | |
| 314 | 5082 int pause; |
| 5083 int preempt_count = baud_rate / 2400 + 1; | |
| 21514 | 5084 extern int input_pending; |
| 25012 | 5085 |
| 5086 xassert (current_matrix && desired_matrix); | |
| 314 | 5087 |
|
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5088 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
|
5089 calculate_costs (f); |
|
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5090 |
|
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5091 if (preempt_count <= 0) |
|
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5092 preempt_count = 1; |
|
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5093 |
|
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5094 if (redisplay_dont_pause) |
|
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5095 force_p = 1; |
|
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5096 else if (!force_p && detect_input_pending ()) |
| 314 | 5097 { |
| 5098 pause = 1; | |
| 5099 goto do_pause; | |
| 5100 } | |
| 5101 | |
| 25012 | 5102 /* If we cannot insert/delete lines, it's no use trying it. */ |
| 314 | 5103 if (!line_ins_del_ok) |
| 25012 | 5104 inhibit_id_p = 1; |
|
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5105 |
| 493 | 5106 /* See if any of the desired lines are enabled; don't compute for |
| 25012 | 5107 i/d line if just want cursor motion. */ |
| 5108 for (i = 0; i < desired_matrix->nrows; i++) | |
| 5109 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
| 314 | 5110 break; |
| 5111 | |
| 5112 /* Try doing i/d line, if not yet inhibited. */ | |
| 25012 | 5113 if (!inhibit_id_p && i < desired_matrix->nrows) |
| 5114 force_p |= scrolling (f); | |
| 314 | 5115 |
| 5116 /* Update the individual lines as needed. Do bottom line first. */ | |
| 25012 | 5117 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
| 5118 update_frame_line (f, desired_matrix->nrows - 1); | |
| 5119 | |
| 5120 /* Now update the rest of the lines. */ | |
| 5121 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
| 314 | 5122 { |
| 25012 | 5123 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
| 314 | 5124 { |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5125 if (FRAME_TERMCAP_P (f)) |
| 314 | 5126 { |
| 5127 /* Flush out every so many lines. | |
| 5128 Also flush out if likely to have more than 1k buffered | |
| 5129 otherwise. I'm told that some telnet connections get | |
| 5130 really screwed by more than 1k output at once. */ | |
| 5131 int outq = PENDING_OUTPUT_COUNT (stdout); | |
| 5132 if (outq > 900 | |
| 5133 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
| 5134 { | |
| 5135 fflush (stdout); | |
| 5136 if (preempt_count == 1) | |
| 5137 { | |
| 554 | 5138 #ifdef EMACS_OUTQSIZE |
| 5139 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
| 314 | 5140 /* 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
|
5141 the outq count. */ |
| 314 | 5142 outq = PENDING_OUTPUT_COUNT (stdout); |
| 5143 #endif | |
| 5144 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
|
5145 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
|
5146 sleep (outq / baud_rate); |
| 314 | 5147 } |
| 5148 } | |
| 5149 } | |
| 5150 | |
|
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5151 if ((i - 1) % preempt_count == 0) |
|
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5152 detect_input_pending (); |
|
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5153 |
| 25012 | 5154 update_frame_line (f, i); |
| 314 | 5155 } |
| 5156 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5157 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5158 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
| 314 | 5159 |
| 5160 /* Now just clean up termcap drivers and set cursor, etc. */ | |
| 5161 if (!pause) | |
| 5162 { | |
|
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5163 if ((cursor_in_echo_area |
| 25012 | 5164 /* 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
|
5165 show the cursor for the message instead of for the |
| 25012 | 5166 (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
|
5167 || (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
|
5168 && EQ (minibuf_window, echo_area_window) |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5169 && !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
|
5170 /* These cases apply only to the frame that contains |
| 25012 | 5171 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
|
5172 && FRAME_HAS_MINIBUF_P (f) |
|
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5173 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
| 708 | 5174 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5175 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
|
5176 int row, col; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5177 |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5178 if (cursor_in_echo_area < 0) |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5179 { |
| 25012 | 5180 /* Negative value of cursor_in_echo_area means put |
| 5181 cursor at beginning of line. */ | |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5182 row = top; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5183 col = 0; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5184 } |
| 708 | 5185 else |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5186 { |
| 25012 | 5187 /* Positive value of cursor_in_echo_area means put |
| 5188 cursor at the end of the prompt. If the mini-buffer | |
| 5189 is several lines high, find the last line that has | |
| 5190 any text on it. */ | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5191 row = FRAME_LINES (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5192 do |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5193 { |
| 25012 | 5194 --row; |
| 5195 col = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5196 |
| 25012 | 5197 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
| 5198 { | |
| 5199 /* Frame rows are filled up with spaces that | |
| 5200 must be ignored here. */ | |
| 5201 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
| 5202 row); | |
| 5203 struct glyph *start = r->glyphs[TEXT_AREA]; | |
| 5204 struct glyph *last = start + r->used[TEXT_AREA]; | |
| 5205 | |
| 5206 while (last > start | |
| 5207 && (last - 1)->charpos < 0) | |
| 5208 --last; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5209 |
| 25012 | 5210 col = last - start; |
| 5211 } | |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5212 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5213 while (row > top && col == 0); |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5214 |
|
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5215 /* 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
|
5216 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
|
5217 { |
|
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5218 /* 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
|
5219 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
|
5220 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5221 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
|
5222 row++; |
|
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5223 } |
|
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5224 /* 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
|
5225 else |
|
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5226 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
|
5227 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5228 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5229 |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5230 cursor_to (row, col); |
| 708 | 5231 } |
| 314 | 5232 else |
| 25012 | 5233 { |
| 5234 /* We have only one cursor on terminal frames. Use it to | |
| 5235 display the cursor of the selected window. */ | |
| 5236 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
|
5237 if (w->cursor.vpos >= 0 |
|
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5238 /* 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
|
5239 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
|
5240 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
|
5241 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
|
5242 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
|
5243 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
| 25012 | 5244 { |
| 5245 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
| 5246 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
| 5247 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5248 if (INTEGERP (w->left_margin_cols)) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5249 x += XFASTINT (w->left_margin_cols); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5250 |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5251 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
| 25012 | 5252 cursor_to (y, x); |
| 5253 } | |
| 5254 } | |
| 314 | 5255 } |
| 5256 | |
| 5257 do_pause: | |
| 5258 | |
| 25012 | 5259 clear_desired_matrices (f); |
| 314 | 5260 return pause; |
| 5261 } | |
| 5262 | |
| 25012 | 5263 |
| 5264 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
| 314 | 5265 |
| 21514 | 5266 int |
| 764 | 5267 scrolling (frame) |
| 25012 | 5268 struct frame *frame; |
| 314 | 5269 { |
| 5270 int unchanged_at_top, unchanged_at_bottom; | |
| 5271 int window_size; | |
| 5272 int changed_lines; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5273 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
|
5274 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
|
5275 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
|
5276 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
| 314 | 5277 register int i; |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5278 int free_at_end_vpos = FRAME_LINES (frame); |
| 25012 | 5279 struct glyph_matrix *current_matrix = frame->current_matrix; |
| 5280 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
| 5281 | |
| 5282 if (!current_matrix) | |
| 5283 abort (); | |
| 5284 | |
| 5285 /* Compute hash codes of all the lines. Also calculate number of | |
| 5286 changed lines, number of unchanged lines at the beginning, and | |
| 5287 number of unchanged lines at the end. */ | |
| 314 | 5288 changed_lines = 0; |
| 5289 unchanged_at_top = 0; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5290 unchanged_at_bottom = FRAME_LINES (frame); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5291 for (i = 0; i < FRAME_LINES (frame); i++) |
| 314 | 5292 { |
| 5293 /* Give up on this scrolling if some old lines are not enabled. */ | |
| 25012 | 5294 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
| 314 | 5295 return 0; |
| 25012 | 5296 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
| 5297 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
|
5298 { |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5299 /* 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
|
5300 new_hash[i] = old_hash[i]; |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5301 #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
|
5302 draw_cost[i] = INFINITY; |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5303 } |
| 314 | 5304 else |
|
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5305 { |
| 25012 | 5306 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
| 5307 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
|
5308 } |
| 314 | 5309 |
| 5310 if (old_hash[i] != new_hash[i]) | |
| 5311 { | |
| 5312 changed_lines++; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5313 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
| 314 | 5314 } |
| 5315 else if (i == unchanged_at_top) | |
| 5316 unchanged_at_top++; | |
| 25012 | 5317 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
| 314 | 5318 } |
| 5319 | |
| 5320 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
| 25012 | 5321 if ((!scroll_region_ok && changed_lines < baud_rate / 2400) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5322 || unchanged_at_bottom == FRAME_LINES (frame)) |
| 314 | 5323 return 1; |
| 5324 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5325 window_size = (FRAME_LINES (frame) - unchanged_at_top |
| 314 | 5326 - unchanged_at_bottom); |
| 5327 | |
| 5328 if (scroll_region_ok) | |
| 5329 free_at_end_vpos -= unchanged_at_bottom; | |
| 764 | 5330 else if (memory_below_frame) |
| 314 | 5331 free_at_end_vpos = -1; |
| 5332 | |
| 5333 /* If large window, fast terminal and few lines in common between | |
| 25012 | 5334 current frame and desired frame, don't bother with i/d calc. */ |
|
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
5335 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 |
| 314 | 5336 && (window_size >= |
| 5337 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
|
5338 FRAME_LINES (frame) - unchanged_at_bottom, |
| 314 | 5339 old_hash, new_hash, draw_cost))) |
| 5340 return 0; | |
| 5341 | |
| 25012 | 5342 if (window_size < 2) |
| 5343 return 0; | |
| 5344 | |
| 764 | 5345 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
| 314 | 5346 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
|
5347 old_draw_cost + unchanged_at_top - 1, |
| 314 | 5348 old_hash + unchanged_at_top - 1, |
| 5349 new_hash + unchanged_at_top - 1, | |
| 5350 free_at_end_vpos - unchanged_at_top); | |
| 5351 | |
| 5352 return 0; | |
| 5353 } | |
| 25012 | 5354 |
| 5355 | |
| 5356 /* Count the number of blanks at the start of the vector of glyphs R | |
| 5357 which is LEN glyphs long. */ | |
| 5358 | |
| 5359 static int | |
| 5360 count_blanks (r, len) | |
| 5361 struct glyph *r; | |
| 5362 int len; | |
| 314 | 5363 { |
| 25012 | 5364 int i; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5365 |
| 25012 | 5366 for (i = 0; i < len; ++i) |
| 5367 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
| 5368 break; | |
| 5369 | |
| 5370 return i; | |
| 314 | 5371 } |
| 25012 | 5372 |
| 5373 | |
| 5374 /* Count the number of glyphs in common at the start of the glyph | |
| 5375 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
| 5376 of STR2. Value is the number of equal glyphs equal at the start. */ | |
| 314 | 5377 |
| 5378 static int | |
| 25012 | 5379 count_match (str1, end1, str2, end2) |
| 5380 struct glyph *str1, *end1, *str2, *end2; | |
| 314 | 5381 { |
| 25012 | 5382 struct glyph *p1 = str1; |
| 5383 struct glyph *p2 = str2; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5384 |
| 25012 | 5385 while (p1 < end1 |
| 5386 && p2 < end2 | |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5387 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
| 25012 | 5388 ++p1, ++p2; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5389 |
| 25012 | 5390 return p1 - str1; |
| 314 | 5391 } |
| 5392 | |
| 25012 | 5393 |
| 314 | 5394 /* Char insertion/deletion cost vector, from term.c */ |
| 25012 | 5395 |
| 314 | 5396 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
|
5397 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
| 314 | 5398 |
| 25012 | 5399 |
| 5400 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
| 5401 | |
| 314 | 5402 static void |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5403 update_frame_line (f, vpos) |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5404 struct frame *f; |
| 314 | 5405 int vpos; |
| 5406 { | |
| 25012 | 5407 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
| 314 | 5408 int tem; |
| 5409 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
|
5410 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
|
5411 struct glyph_matrix *desired_matrix = f->desired_matrix; |
| 25012 | 5412 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
| 5413 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
| 5414 int must_write_whole_line_p; | |
|
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5415 int write_spaces_p = must_write_spaces; |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5416 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
|
5417 != FACE_TTY_DEFAULT_BG_COLOR); |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5418 |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5419 if (colored_spaces_p) |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5420 write_spaces_p = 1; |
| 25012 | 5421 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5422 /* 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
|
5423 write the whole desired line in that case. */ |
| 25012 | 5424 must_write_whole_line_p = !current_row->enabled_p; |
| 5425 if (must_write_whole_line_p) | |
| 314 | 5426 { |
| 25012 | 5427 obody = 0; |
| 314 | 5428 olen = 0; |
| 5429 } | |
| 5430 else | |
| 5431 { | |
| 25012 | 5432 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
| 5433 olen = current_row->used[TEXT_AREA]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5434 |
|
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5435 /* 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
|
5436 if (!write_spaces_p) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5437 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
|
5438 olen--; |
| 314 | 5439 } |
| 5440 | |
| 25012 | 5441 current_row->enabled_p = 1; |
| 5442 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
| 5443 | |
| 5444 /* If desired line is empty, just clear the line. */ | |
| 5445 if (!desired_row->enabled_p) | |
| 314 | 5446 { |
| 5447 nlen = 0; | |
| 5448 goto just_erase; | |
| 5449 } | |
| 5450 | |
| 25012 | 5451 nbody = desired_row->glyphs[TEXT_AREA]; |
| 5452 nlen = desired_row->used[TEXT_AREA]; | |
| 5453 nend = nbody + nlen; | |
| 5454 | |
| 5455 /* If display line has unknown contents, write the whole line. */ | |
| 5456 if (must_write_whole_line_p) | |
| 5457 { | |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5458 /* 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
|
5459 if (!write_spaces_p) |
|
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5460 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
|
5461 --nlen; |
|
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5462 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5463 /* 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
|
5464 if (nlen) |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5465 { |
|
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5466 cursor_to (vpos, 0); |
|
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5467 write_glyphs (nbody, nlen); |
|
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5468 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5469 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5470 /* 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
|
5471 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
|
5472 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
|
5473 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
|
5474 { |
|
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5475 cursor_to (vpos, nlen); |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5476 clear_end_of_line (FRAME_TOTAL_COLS (f)); |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5477 } |
|
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5478 else |
|
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5479 /* 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
|
5480 with cmgoto might use `ch' in the wrong row. */ |
|
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5481 cursor_to (vpos, 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5482 |
| 25012 | 5483 make_current (desired_matrix, current_matrix, vpos); |
| 5484 return; | |
| 5485 } | |
| 314 | 5486 |
| 5487 /* Pretend trailing spaces are not there at all, | |
| 5488 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
|
5489 if (!write_spaces_p) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5490 while (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
|
5491 nlen--; |
| 314 | 5492 |
| 5493 /* If there's no i/d char, quickly do the best we can without it. */ | |
| 5494 if (!char_ins_del_ok) | |
| 5495 { | |
| 25012 | 5496 int i, j; |
| 5497 | |
| 5498 /* Find the first glyph in desired row that doesn't agree with | |
| 5499 a glyph in the current row, and write the rest from there on. */ | |
| 314 | 5500 for (i = 0; i < nlen; i++) |
| 5501 { | |
| 25012 | 5502 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
| 314 | 5503 { |
| 25012 | 5504 /* Find the end of the run of different glyphs. */ |
| 5505 j = i + 1; | |
| 5506 while (j < nlen | |
| 5507 && (j >= olen | |
| 5508 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
| 5509 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
| 5510 ++j; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5511 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5512 /* Output this run of non-matching chars. */ |
| 314 | 5513 cursor_to (vpos, i); |
| 25012 | 5514 write_glyphs (nbody + i, j - i); |
| 5515 i = j - 1; | |
| 314 | 5516 |
| 5517 /* Now find the next non-match. */ | |
| 5518 } | |
| 5519 } | |
| 5520 | |
| 5521 /* Clear the rest of the line, or the non-clear part of it. */ | |
| 5522 if (olen > nlen) | |
| 5523 { | |
| 5524 cursor_to (vpos, nlen); | |
| 5525 clear_end_of_line (olen); | |
| 5526 } | |
| 5527 | |
| 25012 | 5528 /* Make current row = desired row. */ |
| 5529 make_current (desired_matrix, current_matrix, vpos); | |
| 314 | 5530 return; |
| 5531 } | |
| 5532 | |
| 25012 | 5533 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
| 5534 characters in a row. */ | |
| 5535 | |
| 314 | 5536 if (!olen) |
| 5537 { | |
| 25012 | 5538 /* If current line is blank, skip over initial spaces, if |
| 5539 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
|
5540 if (write_spaces_p) |
| 25012 | 5541 nsp = 0; |
| 5542 else | |
| 5543 nsp = count_blanks (nbody, nlen); | |
| 5544 | |
| 314 | 5545 if (nlen > nsp) |
| 5546 { | |
| 5547 cursor_to (vpos, nsp); | |
| 5548 write_glyphs (nbody + nsp, nlen - nsp); | |
| 5549 } | |
| 5550 | |
| 764 | 5551 /* Exchange contents between current_frame and new_frame. */ |
| 25012 | 5552 make_current (desired_matrix, current_matrix, vpos); |
| 314 | 5553 return; |
| 5554 } | |
| 5555 | |
| 5556 /* Compute number of leading blanks in old and new contents. */ | |
| 25012 | 5557 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
|
5558 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
| 25012 | 5559 |
| 5560 /* Compute number of matching chars starting with first non-blank. */ | |
| 5561 begmatch = count_match (obody + osp, obody + olen, | |
| 5562 nbody + nsp, nbody + nlen); | |
| 314 | 5563 |
| 5564 /* Spaces in new match implicit space past the end of old. */ | |
| 5565 /* 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
|
5566 if (!write_spaces_p && osp + begmatch == olen) |
| 314 | 5567 { |
| 5568 np1 = nbody + nsp; | |
| 25012 | 5569 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
| 5570 ++begmatch; | |
| 314 | 5571 } |
| 5572 | |
| 5573 /* Avoid doing insert/delete char | |
| 5574 just cause number of leading spaces differs | |
| 25012 | 5575 when the following text does not match. */ |
| 314 | 5576 if (begmatch == 0 && osp != nsp) |
| 5577 osp = nsp = min (osp, nsp); | |
| 5578 | |
| 5579 /* Find matching characters at end of line */ | |
| 5580 op1 = obody + olen; | |
| 5581 np1 = nbody + nlen; | |
| 5582 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
| 25012 | 5583 while (op1 > op2 |
| 5584 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
| 314 | 5585 { |
| 5586 op1--; | |
| 5587 np1--; | |
| 5588 } | |
| 5589 endmatch = obody + olen - op1; | |
| 5590 | |
| 5591 /* tem gets the distance to insert or delete. | |
| 5592 endmatch is how many characters we save by doing so. | |
| 5593 Is it worth it? */ | |
| 5594 | |
| 5595 tem = (nlen - nsp) - (olen - osp); | |
| 5596 if (endmatch && tem | |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5597 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem])) |
| 314 | 5598 endmatch = 0; |
| 5599 | |
| 5600 /* nsp - osp is the distance to insert or delete. | |
| 5601 If that is nonzero, begmatch is known to be nonzero also. | |
| 5602 begmatch + endmatch is how much we save by doing the ins/del. | |
| 5603 Is it worth it? */ | |
| 5604 | |
| 5605 if (nsp != osp | |
| 5606 && (!char_ins_del_ok | |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5607 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
| 314 | 5608 { |
| 5609 begmatch = 0; | |
| 5610 endmatch = 0; | |
| 5611 osp = nsp = min (osp, nsp); | |
| 5612 } | |
| 5613 | |
| 5614 /* Now go through the line, inserting, writing and | |
| 5615 deleting as appropriate. */ | |
| 5616 | |
| 5617 if (osp > nsp) | |
| 5618 { | |
| 5619 cursor_to (vpos, nsp); | |
| 5620 delete_glyphs (osp - nsp); | |
| 5621 } | |
| 5622 else if (nsp > osp) | |
| 5623 { | |
| 5624 /* If going to delete chars later in line | |
| 5625 and insert earlier in the line, | |
| 5626 must delete first to avoid losing data in the insert */ | |
| 5627 if (endmatch && nlen < olen + nsp - osp) | |
| 5628 { | |
| 5629 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
| 5630 delete_glyphs (olen + nsp - osp - nlen); | |
| 5631 olen = nlen - (nsp - osp); | |
| 5632 } | |
| 5633 cursor_to (vpos, osp); | |
| 25012 | 5634 insert_glyphs (0, nsp - osp); |
| 314 | 5635 } |
| 5636 olen += nsp - osp; | |
| 5637 | |
| 5638 tem = nsp + begmatch + endmatch; | |
| 5639 if (nlen != tem || olen != tem) | |
| 5640 { | |
| 5641 if (!endmatch || nlen == olen) | |
| 5642 { | |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5643 /* 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
|
5644 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
|
5645 (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
|
5646 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
|
5647 if (nlen == FRAME_TOTAL_COLS (f)) |
| 314 | 5648 olen = 0; |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5649 |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5650 /* 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
|
5651 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
|
5652 unnecessary cursor movement. */ |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5653 if (nlen - tem > 0) |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5654 { |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5655 cursor_to (vpos, nsp + begmatch); |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5656 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5657 } |
| 314 | 5658 } |
| 5659 else if (nlen > olen) | |
| 5660 { | |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5661 /* 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
|
5662 ---------------------------------------- |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5663 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
|
5664 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
|
5665 ---------------------------------------- |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5666 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
|
5667 is a padding glyph. */ |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5668 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
|
5669 int del; |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5670 |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5671 cursor_to (vpos, nsp + begmatch); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5672 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5673 /* 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
|
5674 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
|
5675 out--; |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5676 write_glyphs (nbody + nsp + begmatch, out); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5677 |
| 25012 | 5678 /* 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
|
5679 del = olen - tem - out; |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5680 if (del > 0) |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5681 delete_glyphs (del); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5682 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5683 /* At last, we insert columns not yet written out. */ |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5684 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); |
| 314 | 5685 olen = nlen; |
| 5686 } | |
| 5687 else if (olen > nlen) | |
| 5688 { | |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5689 cursor_to (vpos, nsp + begmatch); |
| 314 | 5690 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
| 5691 delete_glyphs (olen - nlen); | |
| 5692 olen = nlen; | |
| 5693 } | |
| 5694 } | |
| 5695 | |
| 5696 just_erase: | |
| 5697 /* If any unerased characters remain after the new line, erase them. */ | |
| 5698 if (olen > nlen) | |
| 5699 { | |
| 5700 cursor_to (vpos, nlen); | |
| 5701 clear_end_of_line (olen); | |
| 5702 } | |
| 5703 | |
| 764 | 5704 /* Exchange contents between current_frame and new_frame. */ |
| 25012 | 5705 make_current (desired_matrix, current_matrix, vpos); |
| 314 | 5706 } |
| 25012 | 5707 |
| 5708 | |
| 314 | 5709 |
| 25012 | 5710 /*********************************************************************** |
| 5711 X/Y Position -> Buffer Position | |
| 5712 ***********************************************************************/ | |
| 5713 | |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5714 /* 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
|
5715 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
|
5716 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
|
5717 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
|
5718 |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5719 Lisp_Object |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5720 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
| 25012 | 5721 struct window *w; |
| 5722 int *x, *y; | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5723 struct display_pos *pos; |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5724 Lisp_Object *object; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5725 int *dx, *dy; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5726 int *width, *height; |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5727 { |
| 25012 | 5728 struct it it; |
| 5729 struct buffer *old_current_buffer = current_buffer; | |
| 5730 struct text_pos startp; | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5731 Lisp_Object string; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5732 struct glyph_row *row; |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5733 #ifdef HAVE_WINDOW_SYSTEM |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5734 struct image *img = 0; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5735 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5736 int x0, x1; |
| 25012 | 5737 |
| 5738 current_buffer = XBUFFER (w->buffer); | |
| 5739 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
| 5740 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
| 5741 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
| 5742 start_display (&it, w, startp); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5743 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5744 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
|
5745 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
| 25012 | 5746 MOVE_TO_X | MOVE_TO_Y); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5747 |
| 25012 | 5748 current_buffer = old_current_buffer; |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5749 |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5750 *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
|
5751 *dy = *y - it.current_y; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5752 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5753 string = w->buffer; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5754 if (STRINGP (it.string)) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5755 string = it.string; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5756 *pos = it.current; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5757 |
|
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
|
5758 #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
|
5759 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
|
5760 { |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5761 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
|
5762 && !NILP (img->spec)) |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5763 *object = img->spec; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5764 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5765 #endif |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5766 |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5767 row = MATRIX_ROW (w->current_matrix, it.vpos); |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5768 if (row->enabled_p) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5769 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5770 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
|
5771 { |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5772 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
|
5773 #ifdef HAVE_WINDOW_SYSTEM |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5774 if (img) |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5775 { |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5776 *dy -= row->ascent - glyph->ascent; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5777 *dx += glyph->slice.x; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5778 *dy += glyph->slice.y; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5779 /* 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
|
5780 *width = img->width; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5781 *height = img->height; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5782 } |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5783 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5784 #endif |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5785 { |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5786 *width = glyph->pixel_width; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5787 *height = glyph->ascent + glyph->descent; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5788 } |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5789 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5790 else |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5791 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5792 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5793 *height = row->height; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5794 } |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5795 } |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5796 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5797 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5798 *width = *height = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5799 } |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5800 |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5801 /* 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
|
5802 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
|
5803 if (x0 > x1) |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5804 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
|
5805 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5806 *x = it.hpos; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5807 *y = it.vpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5808 |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5809 return string; |
| 25012 | 5810 } |
| 5811 | |
| 5812 | |
| 5813 /* 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
|
5814 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
|
5815 *CHARPOS is set to the position in the string returned. */ |
| 25012 | 5816 |
| 5817 Lisp_Object | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5818 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
| 25012 | 5819 struct window *w; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5820 enum window_part part; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5821 int *x, *y; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5822 int *charpos; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5823 Lisp_Object *object; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5824 int *dx, *dy; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5825 int *width, *height; |
| 25012 | 5826 { |
| 5827 struct glyph_row *row; | |
| 5828 struct glyph *glyph, *end; | |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5829 int x0, y0; |
| 25012 | 5830 Lisp_Object string = Qnil; |
| 5831 | |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5832 if (part == ON_MODE_LINE) |
| 25012 | 5833 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
| 5834 else | |
| 25546 | 5835 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
|
5836 y0 = *y - row->y; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5837 *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
|
5838 |
| 25012 | 5839 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
|
5840 { |
| 25012 | 5841 /* Find the glyph under X. If we find one with a string object, |
| 5842 it's the one we were looking for. */ | |
| 5843 glyph = row->glyphs[TEXT_AREA]; | |
| 5844 end = glyph + row->used[TEXT_AREA]; | |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5845 for (x0 = *x; glyph < end && x0 > glyph->pixel_width; ++glyph) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5846 x0 -= glyph->pixel_width; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5847 *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
|
5848 if (glyph < end) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5849 { |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5850 string = glyph->object; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5851 *charpos = glyph->charpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5852 *width = glyph->pixel_width; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5853 *height = glyph->ascent + glyph->descent; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5854 #ifdef HAVE_WINDOW_SYSTEM |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5855 if (glyph->type == IMAGE_GLYPH) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5856 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5857 struct image *img; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5858 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
|
5859 if (img != NULL) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5860 *object = img->spec; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5861 y0 -= row->ascent - glyph->ascent; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5862 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5863 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5864 } |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5865 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5866 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5867 /* 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
|
5868 *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
|
5869 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5870 *height = row->height; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5871 } |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5872 } |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5873 else |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5874 { |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5875 *x = 0; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5876 x0 = 0; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5877 *width = *height = 0; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5878 } |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5879 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5880 *dx = x0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5881 *dy = y0; |
| 25012 | 5882 |
| 5883 return string; | |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5884 } |
| 25012 | 5885 |
| 5886 | |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5887 /* 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
|
5888 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
|
5889 the string returned. */ |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5890 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5891 Lisp_Object |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5892 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
|
5893 struct window *w; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5894 enum window_part part; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5895 int *x, *y; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5896 int *charpos; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5897 Lisp_Object *object; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5898 int *dx, *dy; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5899 int *width, *height; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5900 { |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5901 struct glyph_row *row = w->current_matrix->rows; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5902 struct glyph *glyph, *end; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5903 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
|
5904 int area; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5905 Lisp_Object string = Qnil; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5906 |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5907 if (part == ON_LEFT_MARGIN) |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5908 area = LEFT_MARGIN_AREA; |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5909 else if (part == ON_RIGHT_MARGIN) |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5910 area = RIGHT_MARGIN_AREA; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5911 else |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5912 abort (); |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5913 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5914 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
|
5915 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5916 break; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5917 y0 = *y - row->y; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5918 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5919 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5920 if (row->enabled_p) |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5921 { |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5922 /* 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
|
5923 it's the one we were looking for. */ |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5924 if (area == RIGHT_MARGIN_AREA) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5925 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
|
5926 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5927 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5928 + 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
|
5929 + window_box_width (w, TEXT_AREA)); |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5930 else |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5931 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
|
5932 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5933 : 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5934 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5935 glyph = row->glyphs[area]; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5936 end = glyph + row->used[area]; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5937 for (x0 = *x - x0; glyph < end && x0 > glyph->pixel_width; ++glyph) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5938 x0 -= glyph->pixel_width; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5939 *x = glyph - row->glyphs[area]; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5940 if (glyph < end) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5941 { |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5942 string = glyph->object; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5943 *charpos = glyph->charpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5944 *width = glyph->pixel_width; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5945 *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
|
5946 #ifdef HAVE_WINDOW_SYSTEM |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5947 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
|
5948 { |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5949 struct image *img; |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5950 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
|
5951 if (img != NULL) |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5952 *object = img->spec; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5953 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
|
5954 x0 += glyph->slice.x; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5955 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
|
5956 } |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5957 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5958 } |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5959 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5960 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5961 /* 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
|
5962 *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
|
5963 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5964 *height = row->height; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5965 } |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5966 } |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5967 else |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5968 { |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5969 x0 = 0; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5970 *x = 0; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5971 *width = *height = 0; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5972 } |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5973 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5974 *dx = x0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5975 *dy = y0; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5976 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5977 return string; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5978 } |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5979 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5980 |
| 25012 | 5981 /*********************************************************************** |
| 5982 Changing Frame Sizes | |
| 5983 ***********************************************************************/ | |
| 314 | 5984 |
| 5985 #ifdef SIGWINCH | |
| 25012 | 5986 |
| 493 | 5987 SIGTYPE |
|
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
5988 window_change_signal (signalnum) /* If we don't have an argument, */ |
| 25012 | 5989 int signalnum; /* some compilers complain in signal calls. */ |
| 314 | 5990 { |
| 5991 int width, height; | |
|
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5992 #ifndef USE_CRT_DLL |
| 314 | 5993 extern int errno; |
|
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5994 #endif |
| 314 | 5995 int old_errno = errno; |
| 5996 | |
| 764 | 5997 get_frame_size (&width, &height); |
| 314 | 5998 |
| 764 | 5999 /* The frame size change obviously applies to a termcap-controlled |
| 6000 frame. Find such a frame in the list, and assume it's the only | |
| 314 | 6001 one (since the redisplay code always writes to stdout, not a |
| 764 | 6002 FILE * specified in the frame structure). Record the new size, |
| 314 | 6003 but don't reallocate the data structures now. Let that be done |
| 6004 later outside of the signal handler. */ | |
| 6005 | |
| 6006 { | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6007 Lisp_Object tail, frame; |
| 314 | 6008 |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6009 FOR_EACH_FRAME (tail, frame) |
| 314 | 6010 { |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6011 if (FRAME_TERMCAP_P (XFRAME (frame))) |
| 314 | 6012 { |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6013 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
| 314 | 6014 break; |
| 6015 } | |
| 6016 } | |
| 6017 } | |
| 6018 | |
| 6019 signal (SIGWINCH, window_change_signal); | |
| 6020 errno = old_errno; | |
| 6021 } | |
| 6022 #endif /* SIGWINCH */ | |
| 6023 | |
| 6024 | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6025 /* 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
|
6026 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
|
6027 safe to change frame sizes while a redisplay is in progress. */ |
| 314 | 6028 |
| 21514 | 6029 void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6030 do_pending_window_change (safe) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6031 int safe; |
| 314 | 6032 { |
| 6033 /* 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
|
6034 if (redisplaying_p && !safe) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6035 return; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6036 |
| 314 | 6037 while (delayed_size_change) |
| 6038 { | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6039 Lisp_Object tail, frame; |
| 314 | 6040 |
| 6041 delayed_size_change = 0; | |
| 6042 | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6043 FOR_EACH_FRAME (tail, frame) |
| 314 | 6044 { |
| 25012 | 6045 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
|
6046 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6047 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
|
6048 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
|
6049 0, 0, safe); |
| 314 | 6050 } |
| 6051 } | |
| 6052 } | |
| 6053 | |
| 6054 | |
| 764 | 6055 /* 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
|
6056 indicate no change is to take place. |
| 314 | 6057 |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6058 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
|
6059 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
|
6060 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
|
6061 from a signal handler. |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6062 |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6063 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
|
6064 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
|
6065 |
| 21514 | 6066 void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6067 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
| 25012 | 6068 register struct frame *f; |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6069 int newheight, newwidth, pretend, delay, safe; |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6070 { |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6071 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
|
6072 |
|
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
6073 if (! FRAME_WINDOW_P (f)) |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6074 { |
|
15394
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
6075 /* When using termcap, or on MS-DOS, all frames use |
|
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
6076 the same screen, so a change in size affects all frames. */ |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6077 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
|
6078 if (! FRAME_WINDOW_P (XFRAME (frame))) |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6079 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
|
6080 pretend, delay, safe); |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6081 } |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6082 else |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6083 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
|
6084 } |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6085 |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6086 static void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6087 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
| 25012 | 6088 register struct frame *f; |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6089 int newheight, newwidth, pretend, delay, safe; |
| 314 | 6090 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6091 int new_frame_total_cols; |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6092 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
|
6093 |
| 314 | 6094 /* 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
|
6095 if (delay || (redisplaying_p && !safe)) |
| 314 | 6096 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6097 f->new_text_lines = newheight; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6098 f->new_text_cols = newwidth; |
| 314 | 6099 delayed_size_change = 1; |
| 6100 return; | |
| 6101 } | |
| 6102 | |
| 764 | 6103 /* 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
|
6104 f->new_text_lines = 0; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6105 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
|
6106 |
|
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6107 /* 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
|
6108 if (newheight == 0) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6109 newheight = FRAME_LINES (f); |
|
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6110 if (newwidth == 0) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6111 newwidth = FRAME_COLS (f); |
| 25012 | 6112 |
| 6113 /* Compute width of windows in F. | |
| 6114 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
|
6115 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
|
6116 |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6117 /* Round up to the smallest acceptable size. */ |
| 25012 | 6118 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
|
6119 |
|
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6120 /* 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
|
6121 if (newheight == FRAME_LINES (f) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6122 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
| 314 | 6123 return; |
| 6124 | |
| 15078 | 6125 BLOCK_INPUT; |
| 6126 | |
|
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6127 #ifdef MSDOS |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6128 /* 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
|
6129 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
|
6130 or equal to the requested dimensions. */ |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6131 dos_set_window_size (&newheight, &newwidth); |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6132 #endif |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6133 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6134 if (newheight != FRAME_LINES (f)) |
| 314 | 6135 { |
| 25012 | 6136 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
| 314 | 6137 { |
| 25012 | 6138 /* 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
|
6139 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
| 25012 | 6140 FRAME_TOP_MARGIN (f)); |
| 6141 set_window_height (FRAME_ROOT_WINDOW (f), | |
| 6142 (newheight | |
| 6143 - 1 | |
| 6144 - FRAME_TOP_MARGIN (f)), | |
| 6145 0); | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6146 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
|
6147 newheight - 1); |
| 25012 | 6148 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
| 314 | 6149 } |
| 6150 else | |
| 764 | 6151 /* Frame has just one top-level window. */ |
| 25012 | 6152 set_window_height (FRAME_ROOT_WINDOW (f), |
| 6153 newheight - FRAME_TOP_MARGIN (f), 0); | |
| 6154 | |
| 6155 if (FRAME_TERMCAP_P (f) && !pretend) | |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6156 FrameRows = newheight; |
| 314 | 6157 } |
| 6158 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6159 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
| 314 | 6160 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6161 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 0); |
| 25012 | 6162 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
|
6163 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
| 25012 | 6164 |
| 6165 if (FRAME_TERMCAP_P (f) && !pretend) | |
| 764 | 6166 FrameCols = newwidth; |
| 25012 | 6167 |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6168 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
|
6169 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
| 314 | 6170 } |
| 6171 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6172 FRAME_LINES (f) = newheight; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6173 SET_FRAME_COLS (f, newwidth); |
| 25012 | 6174 |
| 6175 { | |
| 6176 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
| 6177 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
|
6178 |
| 25012 | 6179 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
| 6180 &text_area_height); | |
| 6181 if (w->cursor.x >= text_area_x + text_area_width) | |
| 6182 w->cursor.hpos = w->cursor.x = 0; | |
| 6183 if (w->cursor.y >= text_area_y + text_area_height) | |
| 6184 w->cursor.vpos = w->cursor.y = 0; | |
| 6185 } | |
| 6186 | |
| 6187 adjust_glyphs (f); | |
|
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6188 calculate_costs (f); |
| 25012 | 6189 SET_FRAME_GARBAGED (f); |
|
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6190 f->resized_p = 1; |
| 15065 | 6191 |
| 6192 UNBLOCK_INPUT; | |
|
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6193 |
|
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6194 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
|
6195 |
|
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6196 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
| 25012 | 6197 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
|
6198 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
|
6199 |
|
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6200 unbind_to (count, Qnil); |
| 314 | 6201 } |
| 25012 | 6202 |
| 6203 | |
| 314 | 6204 |
| 25012 | 6205 /*********************************************************************** |
| 6206 Terminal Related Lisp Functions | |
| 6207 ***********************************************************************/ | |
| 6208 | |
| 6209 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6210 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
|
6211 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
|
6212 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
|
6213 (file) |
| 25012 | 6214 Lisp_Object file; |
| 6215 { | |
| 6216 if (termscript != 0) fclose (termscript); | |
| 6217 termscript = 0; | |
| 6218 | |
| 6219 if (! NILP (file)) | |
| 6220 { | |
| 6221 file = Fexpand_file_name (file, Qnil); | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6222 termscript = fopen (SDATA (file), "w"); |
| 25012 | 6223 if (termscript == 0) |
| 6224 report_file_error ("Opening termscript", Fcons (file, Qnil)); | |
| 6225 } | |
| 6226 return Qnil; | |
| 6227 } | |
| 6228 | |
| 6229 | |
| 314 | 6230 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6231 Ssend_string_to_terminal, 1, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6232 doc: /* Send STRING to the terminal without alteration. |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6233 Control characters in STRING will have terminal-dependent effects. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6234 (string) |
|
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6235 Lisp_Object string; |
| 314 | 6236 { |
|
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6237 /* ??? 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
|
6238 CHECK_STRING (string); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6239 fwrite (SDATA (string), 1, SBYTES (string), stdout); |
| 314 | 6240 fflush (stdout); |
| 6241 if (termscript) | |
| 6242 { | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6243 fwrite (SDATA (string), 1, SBYTES (string), |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6244 termscript); |
| 314 | 6245 fflush (termscript); |
| 6246 } | |
| 6247 return Qnil; | |
| 6248 } | |
| 6249 | |
| 25012 | 6250 |
| 314 | 6251 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
|
6252 doc: /* Beep, or flash the screen. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6253 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
|
6254 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
|
6255 (arg) |
| 314 | 6256 Lisp_Object arg; |
| 6257 { | |
| 493 | 6258 if (!NILP (arg)) |
| 314 | 6259 { |
|
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6260 if (noninteractive) |
|
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6261 putchar (07); |
|
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6262 else |
|
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6263 ring_bell (); |
| 314 | 6264 fflush (stdout); |
| 6265 } | |
| 6266 else | |
| 6267 bitch_at_user (); | |
| 6268 | |
| 6269 return Qnil; | |
| 6270 } | |
| 6271 | |
| 21514 | 6272 void |
| 314 | 6273 bitch_at_user () |
| 6274 { | |
| 6275 if (noninteractive) | |
| 6276 putchar (07); | |
| 25012 | 6277 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
| 314 | 6278 error ("Keyboard macro terminated by a command ringing the bell"); |
| 6279 else | |
| 6280 ring_bell (); | |
| 6281 fflush (stdout); | |
| 6282 } | |
| 6283 | |
| 25012 | 6284 |
| 6285 | |
| 6286 /*********************************************************************** | |
| 6287 Sleeping, Waiting | |
| 6288 ***********************************************************************/ | |
| 6289 | |
| 314 | 6290 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
|
6291 doc: /* Pause, without updating display, for SECONDS seconds. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6292 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
|
6293 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
|
6294 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
|
6295 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
|
6296 \(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
|
6297 (seconds, milliseconds) |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6298 Lisp_Object seconds, milliseconds; |
| 314 | 6299 { |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6300 int sec, usec; |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6301 |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6302 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
|
6303 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
|
6304 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6305 CHECK_NUMBER (milliseconds); |
| 2648 | 6306 usec = XINT (milliseconds) * 1000; |
| 6307 | |
| 6308 { | |
| 6309 double duration = extract_float (seconds); | |
| 6310 sec = (int) duration; | |
| 6311 usec += (duration - sec) * 1000000; | |
| 6312 } | |
| 314 | 6313 |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6314 #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
|
6315 if (sec == 0 && usec != 0) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6316 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6317 #endif |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6318 |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6319 /* 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
|
6320 if (usec < 0) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6321 { |
|
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
|
6322 /* 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
|
6323 if (-1000000 < usec) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6324 sec--, usec += 1000000; |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6325 else |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6326 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
|
6327 } |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6328 else |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6329 sec += usec / 1000000, usec %= 1000000; |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6330 |
|
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6331 if (sec < 0 || (sec == 0 && usec == 0)) |
| 314 | 6332 return Qnil; |
| 6333 | |
| 650 | 6334 { |
| 6335 Lisp_Object zero; | |
| 6336 | |
|
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6337 XSETFASTINT (zero, 0); |
| 650 | 6338 wait_reading_process_input (sec, usec, zero, 0); |
| 6339 } | |
| 587 | 6340 |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6341 /* We should always have wait_reading_process_input; we have a dummy |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6342 implementation for systems which don't support subprocesses. */ |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6343 #if 0 |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6344 /* No wait_reading_process_input */ |
| 314 | 6345 immediate_quit = 1; |
| 6346 QUIT; | |
| 6347 | |
| 6348 #ifdef VMS | |
| 6349 sys_sleep (sec); | |
| 6350 #else /* not VMS */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6351 /* The reason this is done this way |
| 314 | 6352 (rather than defined (H_S) && defined (H_T)) |
|
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Jan?k <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
6353 is because the VMS preprocessor doesn't grok `defined'. */ |
| 314 | 6354 #ifdef HAVE_SELECT |
| 554 | 6355 EMACS_GET_TIME (end_time); |
| 6356 EMACS_SET_SECS_USECS (timeout, sec, usec); | |
| 587 | 6357 EMACS_ADD_TIME (end_time, end_time, timeout); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6358 |
| 314 | 6359 while (1) |
| 6360 { | |
| 554 | 6361 EMACS_GET_TIME (timeout); |
| 6362 EMACS_SUB_TIME (timeout, end_time, timeout); | |
| 6363 if (EMACS_TIME_NEG_P (timeout) | |
| 6364 || !select (1, 0, 0, 0, &timeout)) | |
| 314 | 6365 break; |
| 6366 } | |
| 6367 #else /* not HAVE_SELECT */ | |
| 6368 sleep (sec); | |
| 6369 #endif /* HAVE_SELECT */ | |
| 6370 #endif /* not VMS */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6371 |
| 314 | 6372 immediate_quit = 0; |
| 6373 #endif /* no subprocesses */ | |
| 6374 | |
| 6375 return Qnil; | |
| 6376 } | |
| 6377 | |
| 25012 | 6378 |
| 650 | 6379 /* This is just like wait_reading_process_input, except that |
| 6380 it does the redisplay. | |
| 6381 | |
|
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6382 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
|
6383 waiting for input as well. */ |
| 650 | 6384 |
| 6385 Lisp_Object | |
|
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6386 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
|
6387 int sec, usec, reading, display, initial_display; |
| 314 | 6388 { |
| 650 | 6389 Lisp_Object read_kbd; |
| 314 | 6390 |
|
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6391 swallow_events (display); |
|
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6392 |
|
43729
5b4c5b84bb9d
(sit_for): Don't wait if executing a kbd macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43713
diff
changeset
|
6393 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro)) |
| 314 | 6394 return Qnil; |
| 650 | 6395 |
|
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6396 if (initial_display) |
|
35336
002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents:
35307
diff
changeset
|
6397 redisplay_preserve_echo_area (2); |
| 314 | 6398 |
| 673 | 6399 if (sec == 0 && usec == 0) |
| 6400 return Qt; | |
| 6401 | |
| 314 | 6402 #ifdef SIGIO |
|
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6403 gobble_input (0); |
| 650 | 6404 #endif |
| 6405 | |
|
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6406 XSETINT (read_kbd, reading ? -1 : 1); |
| 650 | 6407 wait_reading_process_input (sec, usec, read_kbd, display); |
| 6408 | |
| 314 | 6409 return detect_input_pending () ? Qnil : Qt; |
| 6410 } | |
| 6411 | |
| 25012 | 6412 |
| 650 | 6413 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
| 40979 | 6414 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
|
6415 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
|
6416 fraction of a second. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6417 \(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
|
6418 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
|
6419 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
|
6420 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
|
6421 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
|
6422 |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6423 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
|
6424 \(sit-for SECONDS &optional MILLISECONDS NODISP) |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6425 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
|
6426 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
|
6427 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
|
6428 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
|
6429 |
|
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6430 /* 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
|
6431 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
|
6432 (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
|
6433 Lisp_Object seconds, milliseconds, nodisp; |
| 650 | 6434 { |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6435 int sec, usec; |
| 650 | 6436 |
|
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6437 if (NILP (nodisp) && !NUMBERP (milliseconds)) |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6438 { /* New style. */ |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6439 nodisp = milliseconds; |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6440 milliseconds = Qnil; |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6441 } |
|
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6442 |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6443 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
|
6444 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
|
6445 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6446 CHECK_NUMBER (milliseconds); |
| 2648 | 6447 usec = XINT (milliseconds) * 1000; |
| 6448 | |
| 6449 { | |
| 6450 double duration = extract_float (seconds); | |
| 6451 sec = (int) duration; | |
| 6452 usec += (duration - sec) * 1000000; | |
| 6453 } | |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6454 |
| 650 | 6455 #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
|
6456 if (usec != 0 && sec == 0) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6457 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
| 650 | 6458 #endif |
| 6459 | |
|
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6460 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
| 650 | 6461 } |
| 25012 | 6462 |
| 6463 | |
| 314 | 6464 |
| 25012 | 6465 /*********************************************************************** |
| 6466 Other Lisp Functions | |
| 6467 ***********************************************************************/ | |
| 6468 | |
| 6469 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
| 6470 session's frames, frame names, buffers, buffer-read-only flags, and | |
| 6471 buffer-modified-flags, and a trailing sentinel (so we don't need to | |
| 6472 add length checks). */ | |
| 6473 | |
| 6474 static Lisp_Object frame_and_buffer_state; | |
| 6475 | |
| 6476 | |
| 6477 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6478 Sframe_or_buffer_changed_p, 0, 0, 0, |
| 40979 | 6479 doc: /* Return non-nil if the frame and buffer state appears to have changed. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6480 The state variable is an internal vector containing all frames and buffers, |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6481 aside from buffers whose names start with space, |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6482 along with the buffers' read-only and modified flags, which allows a fast |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6483 check to see whether the menu bars might need to be recomputed. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6484 If this function returns non-nil, it updates the internal vector to reflect |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6485 the current state. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6486 () |
| 25012 | 6487 { |
| 6488 Lisp_Object tail, frame, buf; | |
| 6489 Lisp_Object *vecp; | |
| 6490 int n; | |
| 6491 | |
| 6492 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
| 6493 FOR_EACH_FRAME (tail, frame) | |
| 6494 { | |
| 6495 if (!EQ (*vecp++, frame)) | |
| 6496 goto changed; | |
| 6497 if (!EQ (*vecp++, XFRAME (frame)->name)) | |
| 6498 goto changed; | |
| 6499 } | |
| 6500 /* Check that the buffer info matches. | |
| 6501 No need to test for the end of the vector | |
| 6502 because the last element of the vector is lambda | |
| 6503 and that will always cause a mismatch. */ | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6504 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6505 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6506 buf = XCDR (XCAR (tail)); |
| 25012 | 6507 /* 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
|
6508 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
| 25012 | 6509 continue; |
| 6510 if (!EQ (*vecp++, buf)) | |
| 6511 goto changed; | |
| 6512 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) | |
| 6513 goto changed; | |
| 6514 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) | |
| 6515 goto changed; | |
| 6516 } | |
| 6517 /* Detect deletion of a buffer at the end of the list. */ | |
| 6518 if (EQ (*vecp, Qlambda)) | |
| 6519 return Qnil; | |
| 6520 changed: | |
| 6521 /* Start with 1 so there is room for at least one lambda at the end. */ | |
| 6522 n = 1; | |
| 6523 FOR_EACH_FRAME (tail, frame) | |
| 6524 n += 2; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6525 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6526 n += 3; |
| 6527 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ | |
| 6528 if (n > XVECTOR (frame_and_buffer_state)->size | |
| 6529 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) | |
| 6530 /* Add 20 extra so we grow it less often. */ | |
| 6531 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); | |
| 6532 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
| 6533 FOR_EACH_FRAME (tail, frame) | |
| 6534 { | |
| 6535 *vecp++ = frame; | |
| 6536 *vecp++ = XFRAME (frame)->name; | |
| 6537 } | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6538 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6539 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6540 buf = XCDR (XCAR (tail)); |
| 25012 | 6541 /* 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
|
6542 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
| 25012 | 6543 continue; |
| 6544 *vecp++ = buf; | |
| 6545 *vecp++ = XBUFFER (buf)->read_only; | |
| 6546 *vecp++ = Fbuffer_modified_p (buf); | |
| 6547 } | |
| 6548 /* Fill up the vector with lambdas (always at least one). */ | |
| 6549 *vecp++ = Qlambda; | |
| 6550 while (vecp - XVECTOR (frame_and_buffer_state)->contents | |
| 6551 < XVECTOR (frame_and_buffer_state)->size) | |
| 6552 *vecp++ = Qlambda; | |
| 6553 /* Make sure we didn't overflow the vector. */ | |
| 6554 if (vecp - XVECTOR (frame_and_buffer_state)->contents | |
| 6555 > XVECTOR (frame_and_buffer_state)->size) | |
| 6556 abort (); | |
| 6557 return Qt; | |
| 6558 } | |
| 6559 | |
| 6560 | |
| 6561 | |
| 6562 /*********************************************************************** | |
| 6563 Initialization | |
| 6564 ***********************************************************************/ | |
| 6565 | |
| 314 | 6566 char *terminal_type; |
| 6567 | |
| 25012 | 6568 /* Initialization done when Emacs fork is started, before doing stty. |
| 6569 Determine terminal type and set terminal_driver. Then invoke its | |
| 6570 decoding routine to set up variables in the terminal package. */ | |
| 314 | 6571 |
| 21514 | 6572 void |
| 314 | 6573 init_display () |
| 6574 { | |
| 6575 #ifdef HAVE_X_WINDOWS | |
| 6576 extern int display_arg; | |
| 6577 #endif | |
| 6578 | |
| 25012 | 6579 /* Construct the space glyph. */ |
| 6580 space_glyph.type = CHAR_GLYPH; | |
| 6581 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
| 6582 space_glyph.charpos = -1; | |
| 6583 | |
| 314 | 6584 meta_key = 0; |
| 6585 inverse_video = 0; | |
| 6586 cursor_in_echo_area = 0; | |
| 6587 terminal_type = (char *) 0; | |
| 6588 | |
|
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6589 /* 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
|
6590 during startup. */ |
|
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6591 Vwindow_system = Qnil; |
| 314 | 6592 |
|
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6593 /* 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
|
6594 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
|
6595 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
|
6596 using the window system. |
|
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6597 |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6598 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
|
6599 try to use X, and die with an error message if that doesn't work. */ |
| 314 | 6600 |
| 6601 #ifdef HAVE_X_WINDOWS | |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6602 if (! display_arg) |
|
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6603 { |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6604 char *display; |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6605 #ifdef VMS |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6606 display = getenv ("DECW$DISPLAY"); |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6607 #else |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6608 display = getenv ("DISPLAY"); |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6609 #endif |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6610 |
|
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6611 display_arg = (display != 0 && *display != 0); |
| 2364 | 6612 } |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6613 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6614 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
|
6615 #ifndef CANNOT_DUMP |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6616 && initialized |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6617 #endif |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6618 ) |
| 314 | 6619 { |
| 6620 Vwindow_system = intern ("x"); | |
| 6621 #ifdef HAVE_X11 | |
| 6622 Vwindow_system_version = make_number (11); | |
| 6623 #else | |
| 6624 Vwindow_system_version = make_number (10); | |
| 6625 #endif | |
|
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6626 #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
|
6627 /* In some versions of ncurses, |
| 15282 | 6628 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
|
6629 So call tgetent. */ |
|
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6630 { char b[2044]; tgetent (b, "xterm");} |
|
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6631 #endif |
| 25012 | 6632 adjust_frame_glyphs_initially (); |
| 314 | 6633 return; |
| 6634 } | |
| 6635 #endif /* HAVE_X_WINDOWS */ | |
| 6636 | |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6637 #ifdef HAVE_NTGUI |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6638 if (!inhibit_window_system) |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6639 { |
|
16589
ec300a10e407
(init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16412
diff
changeset
|
6640 Vwindow_system = intern ("w32"); |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6641 Vwindow_system_version = make_number (1); |
| 25012 | 6642 adjust_frame_glyphs_initially (); |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6643 return; |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6644 } |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6645 #endif /* HAVE_NTGUI */ |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6646 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6647 #ifdef MAC_OS |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6648 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
|
6649 { |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6650 Vwindow_system = intern ("mac"); |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6651 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
|
6652 adjust_frame_glyphs_initially (); |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6653 return; |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6654 } |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6655 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6656 |
| 314 | 6657 /* If no window system has been specified, try to use the terminal. */ |
| 6658 if (! isatty (0)) | |
| 6659 { | |
|
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6660 fatal ("standard input is not a tty"); |
| 314 | 6661 exit (1); |
| 6662 } | |
| 6663 | |
|
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
|
6664 /* Look at the TERM variable. */ |
| 314 | 6665 terminal_type = (char *) getenv ("TERM"); |
| 6666 if (!terminal_type) | |
| 6667 { | |
| 6668 #ifdef VMS | |
| 6669 fprintf (stderr, "Please specify your terminal type.\n\ | |
| 6670 For types defined in VMS, use set term /device=TYPE.\n\ | |
| 6671 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
| 6672 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
| 6673 #else | |
| 6674 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
| 6675 #endif | |
| 6676 exit (1); | |
| 6677 } | |
| 6678 | |
| 6679 #ifdef VMS | |
| 25012 | 6680 /* VMS DCL tends to up-case things, so down-case term type. |
| 314 | 6681 Hardly any uppercase letters in terminal types; should be none. */ |
| 6682 { | |
| 6683 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
| 6684 char *p; | |
| 6685 | |
| 6686 strcpy (new, terminal_type); | |
| 6687 | |
| 6688 for (p = new; *p; p++) | |
| 6689 if (isupper (*p)) | |
| 6690 *p = tolower (*p); | |
| 6691 | |
| 6692 terminal_type = new; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6693 } |
| 25012 | 6694 #endif /* VMS */ |
| 314 | 6695 |
| 6696 term_init (terminal_type); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6697 |
|
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6698 { |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6699 struct frame *sf = SELECTED_FRAME (); |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6700 int width = FRAME_TOTAL_COLS (sf); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6701 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
|
6702 |
| 25012 | 6703 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
| 6704 | |
| 6705 /* If these sizes are so big they cause overflow, just ignore the | |
| 6706 change. It's not clear what better we could do. */ | |
| 6707 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
|
6708 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
|
6709 } |
|
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6710 |
| 25012 | 6711 adjust_frame_glyphs_initially (); |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6712 calculate_costs (XFRAME (selected_frame)); |
| 314 | 6713 |
| 6714 #ifdef SIGWINCH | |
| 6715 #ifndef CANNOT_DUMP | |
| 6716 if (initialized) | |
| 6717 #endif /* CANNOT_DUMP */ | |
| 6718 signal (SIGWINCH, window_change_signal); | |
| 6719 #endif /* SIGWINCH */ | |
| 25012 | 6720 |
| 6721 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | |
| 6722 if (initialized | |
| 6723 && !noninteractive | |
|
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6724 #ifdef MSDOS |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6725 /* 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
|
6726 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
|
6727 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
|
6728 and internal_terminal_init. */ |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6729 && (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
|
6730 #endif |
| 25012 | 6731 && NILP (Vwindow_system)) |
|
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6732 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6733 /* 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
|
6734 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
|
6735 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
|
6736 |
|
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6737 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
|
6738 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
|
6739 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
|
6740 } |
| 314 | 6741 } |
| 25012 | 6742 |
| 6743 | |
| 314 | 6744 |
| 25012 | 6745 /*********************************************************************** |
| 6746 Blinking cursor | |
| 6747 ***********************************************************************/ | |
| 6748 | |
|
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6749 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
|
6750 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
|
6751 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
|
6752 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
|
6753 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
|
6754 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
|
6755 (window, show) |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6756 Lisp_Object window, show; |
| 25012 | 6757 { |
| 6758 /* Don't change cursor state while redisplaying. This could confuse | |
| 6759 output routines. */ | |
| 6760 if (!redisplaying_p) | |
| 6761 { | |
| 6762 if (NILP (window)) | |
| 6763 window = selected_window; | |
| 6764 else | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6765 CHECK_WINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6766 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6767 XWINDOW (window)->cursor_off_p = NILP (show); |
| 25012 | 6768 } |
| 6769 | |
| 6770 return Qnil; | |
| 6771 } | |
| 6772 | |
| 6773 | |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6774 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
|
6775 Sinternal_show_cursor_p, 0, 1, 0, |
| 40979 | 6776 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
|
6777 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
|
6778 (window) |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6779 Lisp_Object window; |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6780 { |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6781 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6782 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6783 if (NILP (window)) |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6784 window = selected_window; |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6785 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6786 CHECK_WINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6787 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6788 w = XWINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6789 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
|
6790 } |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6791 |
| 25012 | 6792 |
| 6793 /*********************************************************************** | |
| 6794 Initialization | |
| 6795 ***********************************************************************/ | |
| 6796 | |
| 21514 | 6797 void |
| 314 | 6798 syms_of_display () |
| 6799 { | |
| 764 | 6800 defsubr (&Sredraw_frame); |
| 314 | 6801 defsubr (&Sredraw_display); |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6802 defsubr (&Sframe_or_buffer_changed_p); |
| 314 | 6803 defsubr (&Sopen_termscript); |
| 6804 defsubr (&Sding); | |
| 6805 defsubr (&Ssit_for); | |
| 6806 defsubr (&Ssleep_for); | |
| 6807 defsubr (&Ssend_string_to_terminal); | |
|
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6808 defsubr (&Sinternal_show_cursor); |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6809 defsubr (&Sinternal_show_cursor_p); |
| 314 | 6810 |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6811 #if GLYPH_DEBUG |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6812 defsubr (&Sdump_redisplay_history); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6813 #endif |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6814 |
|
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6815 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
|
6816 staticpro (&frame_and_buffer_state); |
|
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6817 |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6818 Qdisplay_table = intern ("display-table"); |
|
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6819 staticpro (&Qdisplay_table); |
|
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6820 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
|
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6821 staticpro (&Qredisplay_dont_pause); |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6822 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6823 DEFVAR_INT ("baud-rate", &baud_rate, |
| 40979 | 6824 doc: /* *The output baud rate of the terminal. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6825 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
|
6826 and the other strategic decisions made during redisplay. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6827 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6828 DEFVAR_BOOL ("inverse-video", &inverse_video, |
| 40979 | 6829 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
|
6830 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
|
6831 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6832 DEFVAR_BOOL ("visible-bell", &visible_bell, |
| 40979 | 6833 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
|
6834 |
|
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6835 See also `ring-bell-function'. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6836 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6837 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
| 40979 | 6838 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
|
6839 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
|
6840 Emacs's frame display when you reenter Emacs. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6841 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
|
6842 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6843 DEFVAR_LISP ("window-system", &Vwindow_system, |
|
41025
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6844 doc: /* Name of window system that Emacs is displaying through. |
|
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6845 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
|
6846 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
|
6847 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6848 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
| 40979 | 6849 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
|
6850 For X windows, this is 10 or 11. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6851 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6852 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
| 40979 | 6853 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
|
6854 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6855 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
| 40979 | 6856 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
|
6857 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
|
6858 Each element can be: |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6859 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
|
6860 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
|
6861 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
|
6862 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
|
6863 while outputting it. */); |
| 314 | 6864 Vglyph_table = Qnil; |
| 6865 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6866 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
| 40979 | 6867 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
|
6868 See `buffer-display-table' for more information. */); |
| 314 | 6869 Vstandard_display_table = Qnil; |
| 6870 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6871 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
| 40979 | 6872 doc: /* *Non-nil means update isn't paused when input is detected. */); |
| 25012 | 6873 redisplay_dont_pause = 0; |
| 6874 | |
| 314 | 6875 /* Initialize `window-system', unless init_display already decided it. */ |
| 6876 #ifdef CANNOT_DUMP | |
| 6877 if (noninteractive) | |
| 6878 #endif | |
| 6879 { | |
| 6880 Vwindow_system = Qnil; | |
| 6881 Vwindow_system_version = Qnil; | |
| 6882 } | |
| 6883 } | |
| 52401 | 6884 |
| 6885 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
| 6886 (do not change this comment) */ |
