Mercurial > emacs
annotate src/xdisp.c @ 24880:dc2d4e32cb21
*** empty log message ***
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 23 Jun 1999 15:11:39 +0000 |
| parents | de2065294ca3 |
| children | 516da11f702d |
| rev | line source |
|---|---|
| 277 | 1 /* Display generation from window structure and buffer text. |
|
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 1998 |
|
18730
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
3 Free Software Foundation, Inc. |
| 277 | 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 | |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
| 277 | 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:
14178
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:
14178
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 277 | 21 |
| 22 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
23 #include <config.h> |
| 277 | 24 #include <stdio.h> |
| 25 /*#include <ctype.h>*/ | |
| 26 #undef NULL | |
| 27 #include "lisp.h" | |
| 769 | 28 #include "frame.h" |
| 277 | 29 #include "window.h" |
| 30 #include "termchar.h" | |
| 31 #include "dispextern.h" | |
| 32 #include "buffer.h" | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
33 #include "charset.h" |
| 277 | 34 #include "indent.h" |
| 35 #include "commands.h" | |
| 36 #include "macros.h" | |
| 37 #include "disptab.h" | |
|
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
38 #include "termhooks.h" |
|
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
39 #include "intervals.h" |
| 12081 | 40 #include "keyboard.h" |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
41 #include "coding.h" |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
42 #include "process.h" |
| 21514 | 43 #include "region-cache.h" |
| 44 | |
|
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
45 #ifdef HAVE_X_WINDOWS |
| 21514 | 46 #include "xterm.h" |
| 47 #endif | |
| 277 | 48 |
|
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
49 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
|
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
50 extern void set_frame_menubar (); |
|
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
51 extern int pending_menu_activation; |
|
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
52 #endif |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
53 |
| 277 | 54 extern int interrupt_input; |
| 55 extern int command_loop_level; | |
| 56 | |
|
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
57 extern int minibuffer_auto_raise; |
|
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
58 |
|
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
59 extern Lisp_Object Qface; |
|
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
60 |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
61 extern Lisp_Object Voverriding_local_map; |
|
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
62 extern Lisp_Object Voverriding_local_map_menu_flag; |
|
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
63 |
|
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
64 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
65 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
|
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
66 Lisp_Object Qredisplay_end_trigger_functions; |
|
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
67 Lisp_Object Qinhibit_point_motion_hooks; |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
68 |
|
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
69 /* Non-nil means don't actually do any redisplay. */ |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
70 |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
71 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
72 |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
73 /* Nonzero means print newline to stdout before next minibuffer message. */ |
| 277 | 74 |
| 75 int noninteractive_need_newline; | |
| 76 | |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
77 /* Nonzero means print newline to message log before next message. */ |
|
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
78 |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
79 static int message_log_need_newline; |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
80 |
| 277 | 81 #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 82 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
| 11810 | 83 #define minmax(floor, val, ceil) \ |
| 84 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val)) | |
| 277 | 85 |
| 86 /* The buffer position of the first character appearing | |
| 769 | 87 entirely or partially on the current frame line. |
| 88 Or zero, which disables the optimization for the current frame line. */ | |
| 277 | 89 static int this_line_bufpos; |
| 90 | |
| 91 /* Number of characters past the end of this line, | |
| 92 including the terminating newline */ | |
| 93 static int this_line_endpos; | |
| 94 | |
| 769 | 95 /* The vertical position of this frame line. */ |
| 277 | 96 static int this_line_vpos; |
| 97 | |
| 769 | 98 /* Hpos value for start of display on this frame line. |
| 277 | 99 Usually zero, but negative if first character really began |
| 100 on previous line */ | |
| 101 static int this_line_start_hpos; | |
| 102 | |
| 103 /* Buffer that this_line variables are describing. */ | |
| 104 static struct buffer *this_line_buffer; | |
| 105 | |
| 106 /* Value of echo_area_glyphs when it was last acted on. | |
| 769 | 107 If this is nonzero, there is a message on the frame |
| 277 | 108 in the minibuffer and it should be erased as soon |
| 109 as it is no longer requested to appear. */ | |
| 110 char *previous_echo_glyphs; | |
| 111 | |
| 769 | 112 /* Nonzero means truncate lines in all windows less wide than the frame */ |
| 277 | 113 int truncate_partial_width_windows; |
| 114 | |
|
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
115 /* A flag to control how to display unibyte 8-bit character. */ |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
116 int unibyte_display_via_language_environment; |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
117 |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
118 /* Nonzero means we have more than one non-minibuffer-only frame. |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
119 Not guaranteed to be accurate except while parsing frame-title-format. */ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
120 int multiple_frames; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
121 |
| 277 | 122 Lisp_Object Vglobal_mode_string; |
| 123 | |
| 124 /* Marker for where to display an arrow on top of the buffer text. */ | |
| 125 Lisp_Object Voverlay_arrow_position; | |
| 126 | |
| 127 /* String to display for the arrow. */ | |
| 128 Lisp_Object Voverlay_arrow_string; | |
| 129 | |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
130 /* Values of those variables at last redisplay. |
|
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
131 However, if Voverlay_arrow_position is a marker, |
|
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
132 last_arrow_position is its numerical position. */ |
|
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
133 static Lisp_Object last_arrow_position, last_arrow_string; |
|
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
134 |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
135 /* Like mode-line-format, but for the titlebar on a visible frame. */ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
136 Lisp_Object Vframe_title_format; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
137 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
138 /* Like mode-line-format, but for the titlebar on an iconified frame. */ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
139 Lisp_Object Vicon_title_format; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
140 |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
141 /* List of functions to call when a window's size changes. These |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
142 functions get one arg, a frame on which one or more windows' sizes |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
143 have changed. */ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
144 static Lisp_Object Vwindow_size_change_functions; |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
145 |
|
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
146 Lisp_Object Qmenu_bar_update_hook; |
|
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
147 |
| 277 | 148 /* Nonzero if overlay arrow has been displayed once in this window. */ |
| 149 static int overlay_arrow_seen; | |
| 150 | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
151 /* Nonzero if visible end of buffer has already been displayed once |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
152 in this window. (We need this variable in case there are overlay |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
153 strings that get displayed there.) */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
154 static int zv_strings_seen; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
155 |
|
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
156 /* Nonzero means highlight the region even in nonselected windows. */ |
|
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
157 static int highlight_nonselected_windows; |
|
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
158 |
| 769 | 159 /* If cursor motion alone moves point off frame, |
| 277 | 160 Try scrolling this many lines up or down if that will bring it back. */ |
|
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
161 static int scroll_step; |
| 277 | 162 |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
163 /* Non-0 means scroll just far enough to bring point back on the screen, |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
164 when appropriate. */ |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
165 static int scroll_conservatively; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
166 |
|
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
167 /* Recenter the window whenever point gets within this many lines |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
168 of the top or bottom of the window. */ |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
169 int scroll_margin; |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
170 |
|
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
171 /* Number of characters of overlap to show, |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
172 when scrolling a one-line window such as a minibuffer. */ |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
173 static int minibuffer_scroll_overlap; |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
174 |
| 277 | 175 /* Nonzero if try_window_id has made blank lines at window bottom |
| 176 since the last redisplay that paused */ | |
| 177 static int blank_end_of_window; | |
| 178 | |
|
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
179 /* Number of windows showing the buffer of the selected window |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
180 (or another buffer with the same base buffer). |
| 277 | 181 keyboard.c refers to this. */ |
| 182 int buffer_shared; | |
| 183 | |
| 769 | 184 /* display_text_line sets these to the frame position (origin 0) of point, |
| 277 | 185 whether the window is selected or not. |
| 186 Set one to -1 first to determine whether point was found afterwards. */ | |
| 187 | |
| 188 static int cursor_vpos; | |
| 189 static int cursor_hpos; | |
| 190 | |
|
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
191 static int debug_end_pos; |
| 277 | 192 |
| 193 /* Nonzero means display mode line highlighted */ | |
| 194 int mode_line_inverse_video; | |
| 195 | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
196 static void redisplay_internal (); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
197 static int message_log_check_duplicate (); |
| 277 | 198 static void echo_area_display (); |
| 199 void mark_window_display_accurate (); | |
| 200 static void redisplay_windows (); | |
| 201 static void redisplay_window (); | |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
202 static void update_menu_bar (); |
| 277 | 203 static void try_window (); |
| 204 static int try_window_id (); | |
| 205 static struct position *display_text_line (); | |
| 206 static void display_mode_line (); | |
| 207 static int display_mode_element (); | |
| 208 static char *decode_mode_spec (); | |
| 209 static int display_string (); | |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
210 static void display_menu_bar (); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
211 static int display_count_lines (); |
| 277 | 212 |
| 213 /* Prompt to display in front of the minibuffer contents */ | |
|
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
214 Lisp_Object minibuf_prompt; |
| 277 | 215 |
| 216 /* Width in columns of current minibuffer prompt. */ | |
| 217 int minibuf_prompt_width; | |
| 218 | |
| 219 /* Message to display instead of minibuffer contents | |
| 220 This is what the functions error and message make, | |
| 221 and command echoing uses it as well. | |
| 222 It overrides the minibuf_prompt as well as the buffer. */ | |
| 223 char *echo_area_glyphs; | |
| 224 | |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
225 /* This is the length of the message in echo_area_glyphs. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
226 int echo_area_glyphs_length; |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
227 |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
228 /* This is the window where the echo area message was displayed. |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
229 It is always a minibuffer window, but it may not be the |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
230 same window currently active as a minibuffer. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
231 Lisp_Object echo_area_window; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
232 |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
233 /* Nonzero means multibyte characters were enabled when the echo area |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
234 message was specified. */ |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
235 int message_enable_multibyte; |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
236 |
| 277 | 237 /* true iff we should redraw the mode lines on the next redisplay */ |
| 238 int update_mode_lines; | |
| 239 | |
| 240 /* Smallest number of characters before the gap | |
| 241 at any time since last redisplay that finished. | |
| 242 Valid for current buffer when try_window_id can be called. */ | |
| 243 int beg_unchanged; | |
| 244 | |
| 245 /* Smallest number of characters after the gap | |
| 246 at any time since last redisplay that finished. | |
| 247 Valid for current buffer when try_window_id can be called. */ | |
| 248 int end_unchanged; | |
| 249 | |
| 250 /* MODIFF as of last redisplay that finished; | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
251 if it matches MODIFF, and overlay_unchanged_modified |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
252 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged |
| 277 | 253 contain no useful information */ |
| 254 int unchanged_modified; | |
| 255 | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
256 /* OVERLAY_MODIFF as of last redisplay that finished. */ |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
257 int overlay_unchanged_modified; |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
258 |
| 277 | 259 /* Nonzero if window sizes or contents have changed |
| 260 since last redisplay that finished */ | |
| 261 int windows_or_buffers_changed; | |
| 262 | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
263 /* Nonzero after display_mode_line if %l was used |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
264 and it displayed a line number. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
265 int line_number_displayed; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
266 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
267 /* Maximum buffer size for which to display line numbers. */ |
|
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
268 static int line_number_display_limit; |
| 10393 | 269 |
| 270 /* Number of lines to keep in the message log buffer. | |
| 271 t means infinite. nil means don't log at all. */ | |
| 272 Lisp_Object Vmessage_log_max; | |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
273 |
|
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
274 #define COERCE_MARKER(X) \ |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
275 (MARKERP ((X)) ? Fmarker_position (X) : (X)) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
276 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
277 static int pos_tab_offset P_ ((struct window *, int, int)); |
| 277 | 278 |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
279 /* Output a newline in the *Messages* buffer if "needs" one. */ |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
280 |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
281 void |
|
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
282 message_log_maybe_newline () |
|
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
283 { |
|
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
284 if (message_log_need_newline) |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
285 message_dolog ("", 0, 1, 0); |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
286 } |
|
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
287 |
|
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
288 |
|
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
289 /* Add a string to the message log, optionally terminated with a newline. |
|
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
290 This function calls low-level routines in order to bypass text property |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
291 hooks, etc. which might not be safe to run. |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
292 MULTIBYTE, if nonzero, means interpret the contents of M as multibyte. */ |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
293 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
294 void |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
295 message_dolog (m, len, nlflag, multibyte) |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
296 char *m; |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
297 int len, nlflag, multibyte; |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
298 { |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
299 if (!NILP (Vmessage_log_max)) |
| 10393 | 300 { |
| 301 struct buffer *oldbuf; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
302 Lisp_Object oldpoint, oldbegv, oldzv; |
|
13733
e51b69e60614
(message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents:
13655
diff
changeset
|
303 int old_windows_or_buffers_changed = windows_or_buffers_changed; |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
304 int point_at_end = 0; |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
305 int zv_at_end = 0; |
|
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
306 Lisp_Object old_deactivate_mark, tem; |
|
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
307 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
308 |
|
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
309 old_deactivate_mark = Vdeactivate_mark; |
| 10393 | 310 oldbuf = current_buffer; |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
311 Fset_buffer (Fget_buffer_create (build_string ("*Messages*"))); |
|
11531
355c40d2b1d2
(message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents:
11499
diff
changeset
|
312 current_buffer->undo_list = Qt; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
313 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
314 oldpoint = Fpoint_marker (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
315 oldbegv = Fpoint_min_marker (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
316 oldzv = Fpoint_max_marker (); |
|
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
317 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
318 |
|
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
319 if (PT == Z) |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
320 point_at_end = 1; |
|
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
321 if (ZV == Z) |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
322 zv_at_end = 1; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
323 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
324 BEGV = BEG; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
325 BEGV_BYTE = BEG_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
326 ZV = Z; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
327 ZV_BYTE = Z_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
328 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
329 |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
330 /* Insert the string--maybe converting multibyte to single byte |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
331 or vice versa, so that all the text fits the buffer. */ |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
332 if (multibyte |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
333 && NILP (current_buffer->enable_multibyte_characters)) |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
334 { |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
335 int i, c, nbytes; |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
336 unsigned char work[1]; |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
337 /* Convert a multibyte string to single-byte |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
338 for the *Message* buffer. */ |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
339 for (i = 0; i < len; i += nbytes) |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
340 { |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
341 c = STRING_CHAR_AND_LENGTH (m + i, len - i, nbytes); |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
342 work[0] = (SINGLE_BYTE_CHAR_P (c) |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
343 ? c |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
344 : multibyte_char_to_unibyte (c, Qnil)); |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
345 insert_1_both (work, 1, 1, 1, 0, 0); |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
346 } |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
347 } |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
348 else if (! multibyte |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
349 && ! NILP (current_buffer->enable_multibyte_characters)) |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
350 { |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
351 int i, c, nbytes; |
|
20786
49d68bf8f34b
(message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents:
20703
diff
changeset
|
352 unsigned char *msg = (unsigned char *) m; |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
353 unsigned char *str, work[4]; |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
354 /* Convert a single-byte string to multibyte |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
355 for the *Message* buffer. */ |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
356 for (i = 0; i < len; i++) |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
357 { |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
358 c = unibyte_char_to_multibyte (msg[i]); |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
359 nbytes = CHAR_STRING (c, work, str); |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
360 insert_1_both (work, 1, nbytes, 1, 0, 0); |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
361 } |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
362 } |
|
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
363 else if (len) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
364 insert_1 (m, len, 1, 0, 0); |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
365 |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
366 if (nlflag) |
| 10393 | 367 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
368 int this_bol, this_bol_byte, prev_bol, prev_bol_byte, dup; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
369 insert_1 ("\n", 1, 1, 0, 0); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
370 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
371 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
372 this_bol = PT; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
373 this_bol_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
374 |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
375 if (this_bol > BEG) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
376 { |
|
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
377 scan_newline (PT, PT_BYTE, BEG, BEG_BYTE, -2, 0); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
378 prev_bol = PT; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
379 prev_bol_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
380 |
|
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
381 dup = message_log_check_duplicate (prev_bol, prev_bol_byte, |
|
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
382 this_bol, this_bol_byte); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
383 if (dup) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
384 { |
|
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
385 del_range_both (prev_bol, prev_bol_byte, |
|
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
386 this_bol, this_bol_byte, 0); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
387 if (dup > 1) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
388 { |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
389 char dupstr[40]; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
390 int duplen; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
391 |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
392 /* If you change this format, don't forget to also |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
393 change message_log_check_duplicate. */ |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
394 sprintf (dupstr, " [%d times]", dup); |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
395 duplen = strlen (dupstr); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
396 TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
397 insert_1 (dupstr, duplen, 1, 0, 1); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
398 } |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
399 } |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
400 } |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
401 |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
402 if (NATNUMP (Vmessage_log_max)) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
403 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
404 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
405 -XFASTINT (Vmessage_log_max) - 1, 0); |
|
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
406 del_range_both (BEG, BEG_BYTE, PT, PT_BYTE, 0); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
407 } |
| 10393 | 408 } |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
409 BEGV = XMARKER (oldbegv)->charpos; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
410 BEGV_BYTE = marker_byte_position (oldbegv); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
411 |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
412 if (zv_at_end) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
413 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
414 ZV = Z; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
415 ZV_BYTE = Z_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
416 } |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
417 else |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
418 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
419 ZV = XMARKER (oldzv)->charpos; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
420 ZV_BYTE = marker_byte_position (oldzv); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
421 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
422 |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
423 if (point_at_end) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
424 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
|
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
425 else |
|
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
426 /* We can't do Fgoto_char (oldpoint) because it will run some |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
427 Lisp code. */ |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
428 TEMP_SET_PT_BOTH (XMARKER (oldpoint)->charpos, |
|
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
429 XMARKER (oldpoint)->bytepos); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
430 |
|
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
431 UNGCPRO; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
432 free_marker (oldpoint); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
433 free_marker (oldbegv); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
434 free_marker (oldzv); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
435 |
|
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
436 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
| 10393 | 437 set_buffer_internal (oldbuf); |
|
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
438 if (NILP (tem)) |
|
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
439 windows_or_buffers_changed = old_windows_or_buffers_changed; |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
440 message_log_need_newline = !nlflag; |
|
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
441 Vdeactivate_mark = old_deactivate_mark; |
| 10393 | 442 } |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
443 } |
|
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
444 |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
445 /* We are at the end of the buffer after just having inserted a newline. |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
446 (Note: We depend on the fact we won't be crossing the gap.) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
447 Check to see if the most recent message looks a lot like the previous one. |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
448 Return 0 if different, 1 if the new one should just replace it, or a |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
449 value N > 1 if we should also append " [N times]". */ |
|
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
450 |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
451 static int |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
452 message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte) |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
453 int prev_bol, this_bol; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
454 int prev_bol_byte, this_bol_byte; |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
455 { |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
456 int i; |
|
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
457 int len = Z_BYTE - 1 - this_bol_byte; |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
458 int seen_dots = 0; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
459 unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
460 unsigned char *p2 = BUF_BYTE_ADDRESS (current_buffer, this_bol_byte); |
|
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
461 |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
462 for (i = 0; i < len; i++) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
463 { |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
464 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.' |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
465 && p1[i] != '\n') |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
466 seen_dots = 1; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
467 if (p1[i] != p2[i]) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
468 return seen_dots; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
469 } |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
470 p1 += len; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
471 if (*p1 == '\n') |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
472 return 2; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
473 if (*p1++ == ' ' && *p1++ == '[') |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
474 { |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
475 int n = 0; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
476 while (*p1 >= '0' && *p1 <= '9') |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
477 n = n * 10 + *p1++ - '0'; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
478 if (strncmp (p1, " times]\n", 8) == 0) |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
479 return n+1; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
480 } |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
481 return 0; |
|
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
482 } |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
483 |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
484 /* Display an echo area message M with a specified length of LEN chars. |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
485 The string may include null characters. If M is 0, clear out any |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
486 existing message, and let the minibuffer text show through. |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
487 |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
488 The buffer M must continue to exist until after the echo area |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
489 gets cleared or some other message gets displayed there. |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
490 |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
491 Do not pass text that is stored in a Lisp string. |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
492 Do not pass text in a buffer that was alloca'd. */ |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
493 |
|
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
494 void |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
495 message2 (m, len, multibyte) |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
496 char *m; |
|
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
497 int len; |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
498 int multibyte; |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
499 { |
|
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
500 /* First flush out any partial line written with print. */ |
|
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
501 message_log_maybe_newline (); |
|
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
502 if (m) |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
503 message_dolog (m, len, 1, multibyte); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
504 message2_nolog (m, len, multibyte); |
| 10393 | 505 } |
| 506 | |
| 507 | |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
508 /* The non-logging counterpart of message2. */ |
| 10393 | 509 |
| 510 void | |
|
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
511 message2_nolog (m, len, multibyte) |
| 10393 | 512 char *m; |
| 513 int len; | |
| 514 { | |
|
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
515 message_enable_multibyte = multibyte; |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
516 |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
517 if (noninteractive) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
518 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
519 if (noninteractive_need_newline) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
520 putc ('\n', stderr); |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
521 noninteractive_need_newline = 0; |
|
18752
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
522 if (m) |
|
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
523 fwrite (m, len, 1, stderr); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
524 if (cursor_in_echo_area == 0) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
525 fprintf (stderr, "\n"); |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
526 fflush (stderr); |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
527 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
528 /* A null message buffer means that the frame hasn't really been |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
529 initialized yet. Error messages get reported properly by |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
530 cmd_error, so this must be just an informative message; toss it. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
531 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
532 { |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
533 Lisp_Object mini_window; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
534 FRAME_PTR f; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
535 |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
536 /* Get the frame containing the minibuffer |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
537 that the selected frame is using. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
538 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
539 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
540 |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
541 FRAME_SAMPLE_VISIBILITY (f); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
542 if (FRAME_VISIBLE_P (selected_frame) |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
543 && ! FRAME_VISIBLE_P (f)) |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
544 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window))); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
545 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
546 if (m) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
547 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
548 echo_area_glyphs = m; |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
549 echo_area_glyphs_length = len; |
|
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
550 |
|
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
551 if (minibuffer_auto_raise) |
|
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
552 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
553 } |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
554 else |
|
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
555 echo_area_glyphs = previous_echo_glyphs = 0; |
|
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
556 |
|
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
557 do_pending_window_change (); |
|
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
558 echo_area_display (); |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
559 update_frame (f, 1, 1); |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
560 do_pending_window_change (); |
|
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
561 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
562 (*frame_up_to_date_hook) (f); |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
563 } |
|
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
564 } |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
565 |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
566 /* Display in echo area the null-terminated ASCII-only string M. |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
567 If M is 0, clear out any existing message, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
568 and let the minibuffer text show through. |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
569 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
570 The string M must continue to exist until after the echo area |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
571 gets cleared or some other message gets displayed there. |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
572 |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
573 Do not pass text that is stored in a Lisp string. |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
574 Do not pass text in a buffer that was alloca'd. */ |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
575 |
|
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
576 void |
|
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
577 message1 (m) |
|
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
578 char *m; |
|
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
579 { |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
580 message2 (m, (m ? strlen (m) : 0), 0); |
|
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
581 } |
|
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
582 |
|
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
583 void |
|
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
584 message1_nolog (m) |
|
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
585 char *m; |
|
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
586 { |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
587 message2_nolog (m, (m ? strlen (m) : 0), 0); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
588 } |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
589 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
590 /* Display a message M which contains a single %s |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
591 which gets replaced with STRING. */ |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
592 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
593 void |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
594 message_with_string (m, string, log) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
595 char *m; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
596 Lisp_Object string; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
597 int log; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
598 { |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
599 if (noninteractive) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
600 { |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
601 if (m) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
602 { |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
603 if (noninteractive_need_newline) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
604 putc ('\n', stderr); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
605 noninteractive_need_newline = 0; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
606 fprintf (stderr, m, XSTRING (string)->data); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
607 if (cursor_in_echo_area == 0) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
608 fprintf (stderr, "\n"); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
609 fflush (stderr); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
610 } |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
611 } |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
612 else if (INTERACTIVE) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
613 { |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
614 /* The frame whose minibuffer we're going to display the message on. |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
615 It may be larger than the selected frame, so we need |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
616 to use its buffer, not the selected frame's buffer. */ |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
617 Lisp_Object mini_window; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
618 FRAME_PTR f; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
619 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
620 /* Get the frame containing the minibuffer |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
621 that the selected frame is using. */ |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
622 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
623 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
624 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
625 /* A null message buffer means that the frame hasn't really been |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
626 initialized yet. Error messages get reported properly by |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
627 cmd_error, so this must be just an informative message; toss it. */ |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
628 if (FRAME_MESSAGE_BUF (f)) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
629 { |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
630 int len; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
631 char *a[1]; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
632 a[0] = (char *) XSTRING (string)->data; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
633 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
634 len = doprnt (FRAME_MESSAGE_BUF (f), |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
635 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
636 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
637 if (log) |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
638 message2 (FRAME_MESSAGE_BUF (f), len, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
639 STRING_MULTIBYTE (string)); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
640 else |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
641 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
642 STRING_MULTIBYTE (string)); |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
643 |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
644 /* Print should start at the beginning of the message |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
645 buffer next time. */ |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
646 message_buf_print = 0; |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
647 } |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
648 } |
|
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
649 } |
|
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
650 |
|
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
651 /* Truncate what will be displayed in the echo area |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
652 the next time we display it--but don't redisplay it now. */ |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
653 |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
654 void |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
655 truncate_echo_area (len) |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
656 int len; |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
657 { |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
658 /* A null message buffer means that the frame hasn't really been |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
659 initialized yet. Error messages get reported properly by |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
660 cmd_error, so this must be just an informative message; toss it. */ |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
661 if (!noninteractive && INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
662 echo_area_glyphs_length = len; |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
663 } |
|
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
664 |
| 769 | 665 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print; |
| 331 | 666 zero if being used by message. */ |
| 667 int message_buf_print; | |
| 668 | |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
669 /* Dump an informative message to the minibuf. If M is 0, clear out |
|
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
670 any existing message, and let the minibuffer text show through. */ |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
671 |
| 277 | 672 /* VARARGS 1 */ |
| 673 void | |
| 674 message (m, a1, a2, a3) | |
| 675 char *m; | |
|
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
676 EMACS_INT a1, a2, a3; |
| 277 | 677 { |
| 678 if (noninteractive) | |
| 679 { | |
|
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
680 if (m) |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
681 { |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
682 if (noninteractive_need_newline) |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
683 putc ('\n', stderr); |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
684 noninteractive_need_newline = 0; |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
685 fprintf (stderr, m, a1, a2, a3); |
|
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
686 if (cursor_in_echo_area == 0) |
|
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
687 fprintf (stderr, "\n"); |
|
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
688 fflush (stderr); |
|
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
689 } |
| 277 | 690 } |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
691 else if (INTERACTIVE) |
| 277 | 692 { |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
693 /* The frame whose minibuffer we're going to display the message on. |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
694 It may be larger than the selected frame, so we need |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
695 to use its buffer, not the selected frame's buffer. */ |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
696 Lisp_Object mini_window; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
697 FRAME_PTR f; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
698 |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
699 /* Get the frame containing the minibuffer |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
700 that the selected frame is using. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
701 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
702 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
| 277 | 703 |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
704 /* A null message buffer means that the frame hasn't really been |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
705 initialized yet. Error messages get reported properly by |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
706 cmd_error, so this must be just an informative message; toss it. */ |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
707 if (FRAME_MESSAGE_BUF (f)) |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
708 { |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
709 if (m) |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
710 { |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
711 int len; |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
712 #ifdef NO_ARG_ARRAY |
|
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
713 char *a[3]; |
|
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
714 a[0] = (char *) a1; |
|
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
715 a[1] = (char *) a2; |
|
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
716 a[2] = (char *) a3; |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
717 |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
718 len = doprnt (FRAME_MESSAGE_BUF (f), |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
719 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
720 #else |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
721 len = doprnt (FRAME_MESSAGE_BUF (f), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
722 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
723 (char **) &a1); |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
724 #endif /* NO_ARG_ARRAY */ |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
725 |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
726 message2 (FRAME_MESSAGE_BUF (f), len, 0); |
|
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
727 } |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
728 else |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
729 message1 (0); |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
730 |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
731 /* Print should start at the beginning of the message |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
732 buffer next time. */ |
|
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
733 message_buf_print = 0; |
|
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
734 } |
| 277 | 735 } |
| 736 } | |
| 737 | |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
738 /* The non-logging version of message. */ |
| 11193 | 739 void |
| 740 message_nolog (m, a1, a2, a3) | |
| 741 char *m; | |
| 742 EMACS_INT a1, a2, a3; | |
| 743 { | |
| 744 Lisp_Object old_log_max; | |
| 745 old_log_max = Vmessage_log_max; | |
| 746 Vmessage_log_max = Qnil; | |
| 747 message (m, a1, a2, a3); | |
| 748 Vmessage_log_max = old_log_max; | |
| 749 } | |
| 750 | |
|
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
751 void |
|
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
752 update_echo_area () |
|
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
753 { |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
754 message2 (echo_area_glyphs, echo_area_glyphs_length, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
755 ! NILP (current_buffer->enable_multibyte_characters)); |
|
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
756 } |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
757 |
| 277 | 758 static void |
| 759 echo_area_display () | |
| 760 { | |
| 761 register int vpos; | |
| 769 | 762 FRAME_PTR f; |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
763 Lisp_Object mini_window; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
764 |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
765 /* Choose the minibuffer window for this display. |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
766 It is the minibuffer window used by the selected frame. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
767 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
768 /* This is the frame that window is in. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
769 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
| 277 | 770 |
| 769 | 771 if (! FRAME_VISIBLE_P (f)) |
| 277 | 772 return; |
| 773 | |
| 769 | 774 if (frame_garbaged) |
| 277 | 775 { |
|
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
776 redraw_garbaged_frames (); |
| 769 | 777 frame_garbaged = 0; |
| 277 | 778 } |
| 779 | |
| 780 if (echo_area_glyphs || minibuf_level == 0) | |
| 781 { | |
|
16266
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
782 int i; |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
783 |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
784 echo_area_window = mini_window; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
785 |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
786 vpos = XFASTINT (XWINDOW (mini_window)->top); |
| 769 | 787 get_display_line (f, vpos, 0); |
|
16266
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
788 |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
789 /* Make sure the columns that overlap a left-hand scroll bar |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
790 are always clear. */ |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
791 for (i = 0; i < FRAME_LEFT_SCROLL_BAR_WIDTH (f); i++) |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
792 f->desired_glyphs->glyphs[vpos][i] = SPACEGLYPH; |
|
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
793 |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
794 display_string (XWINDOW (mini_window), vpos, |
| 277 | 795 echo_area_glyphs ? echo_area_glyphs : "", |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
796 echo_area_glyphs ? echo_area_glyphs_length : -1, |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
797 FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
|
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
798 0, 0, 0, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
799 FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
800 message_enable_multibyte); |
| 277 | 801 |
|
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
802 #if 0 /* This just gets in the way. update_frame does the job. */ |
| 277 | 803 /* If desired cursor location is on this line, put it at end of text */ |
|
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
804 if (cursor_in_echo_area) |
|
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
805 FRAME_CURSOR_Y (f) = vpos; |
| 769 | 806 if (FRAME_CURSOR_Y (f) == vpos) |
| 807 FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; | |
|
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
808 #endif |
| 727 | 809 |
| 810 /* Fill the rest of the minibuffer window with blank lines. */ | |
| 811 { | |
| 812 int i; | |
| 813 | |
|
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
814 for (i = vpos + 1; |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
815 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++) |
| 727 | 816 { |
| 769 | 817 get_display_line (f, i, 0); |
|
18718
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
818 /* We don't use FRAME_SCROLL_BAR_WIDTH (f) as the starting |
|
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
819 hpos, because it is good to clear whatever is behind the |
|
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
820 scroll bar. This does not affect the scroll bar itself. */ |
|
18653
2c1f73252c1c
(echo_area_display): Use proper vpos when clearing extra minibuf lines.
Richard M. Stallman <rms@gnu.org>
parents:
18652
diff
changeset
|
821 display_string (XWINDOW (mini_window), i, |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
822 "", 0, |
|
18718
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
823 0, 0, 0, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
824 0, FRAME_WIDTH (f) + FRAME_SCROLL_BAR_WIDTH (f), |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
825 0); |
| 727 | 826 } |
| 827 } | |
| 277 | 828 } |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
829 else if (!EQ (mini_window, selected_window)) |
| 277 | 830 windows_or_buffers_changed++; |
| 831 | |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
832 if (EQ (mini_window, selected_window)) |
| 277 | 833 this_line_bufpos = 0; |
| 834 | |
| 835 previous_echo_glyphs = echo_area_glyphs; | |
| 836 } | |
|
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
837 |
|
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
838 /* Update frame titles. */ |
|
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
839 |
|
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
840 #ifdef HAVE_WINDOW_SYSTEM |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
841 static char frame_title_buf[512]; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
842 static char *frame_title_ptr; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
843 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
844 static int |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
845 store_frame_title (str, mincol, maxcol) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
846 char *str; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
847 int mincol, maxcol; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
848 { |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
849 char *limit; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
850 if (maxcol < 0 || maxcol >= sizeof(frame_title_buf)) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
851 maxcol = sizeof (frame_title_buf); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
852 limit = &frame_title_buf[maxcol]; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
853 while (*str != '\0' && frame_title_ptr < limit) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
854 *frame_title_ptr++ = *str++; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
855 while (frame_title_ptr < &frame_title_buf[mincol]) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
856 *frame_title_ptr++ = ' '; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
857 return frame_title_ptr - frame_title_buf; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
858 } |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
859 |
|
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
860 static void |
|
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
861 x_consider_frame_title (frame) |
|
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
862 Lisp_Object frame; |
|
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
863 { |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
864 Lisp_Object fmt; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
865 struct buffer *obuf; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
866 int len; |
|
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
867 FRAME_PTR f = XFRAME (frame); |
|
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
868 |
|
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
869 if (!(FRAME_WINDOW_P (f) || FRAME_MINIBUF_ONLY_P (f) || f->explicit_name)) |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
870 return; |
|
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
871 |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
872 /* Do we have more than one visible frame on this X display? */ |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
873 { |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
874 Lisp_Object tail; |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
875 |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
876 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
877 { |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
878 FRAME_PTR tf = XFRAME (XCONS (tail)->car); |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
879 |
|
11948
19ebc17d1288
(x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents:
11920
diff
changeset
|
880 if (tf != f && FRAME_KBOARD (tf) == FRAME_KBOARD (f) |
|
19ebc17d1288
(x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents:
11920
diff
changeset
|
881 && !FRAME_MINIBUF_ONLY_P (tf) |
|
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
882 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
883 break; |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
884 } |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
885 |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
886 multiple_frames = CONSP (tail); |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
887 } |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
888 |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
889 obuf = current_buffer; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
890 Fset_buffer (XWINDOW (f->selected_window)->buffer); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
891 fmt = (FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
892 frame_title_ptr = frame_title_buf; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
893 len = display_mode_element (XWINDOW (f->selected_window), 0, 0, 0, |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
894 0, sizeof (frame_title_buf), fmt); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
895 frame_title_ptr = 0; |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
896 set_buffer_internal (obuf); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
897 /* Set the name only if it's changed. This avoids consing |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
898 in the common case where it hasn't. (If it turns out that we've |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
899 already wasted too much time by walking through the list with |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
900 display_mode_element, then we might need to optimize at a higher |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
901 level than this.) */ |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
902 if (! STRINGP (f->name) || STRING_BYTES (XSTRING (f->name)) != len |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
903 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
904 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); |
|
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
905 } |
|
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
906 #else |
|
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
907 #define frame_title_ptr ((char *)0) |
|
8918
1be99ca9da45
[!HAVE_X_WINDOWS] (store_frame_title): Dummy macro.
Karl Heuer <kwzh@gnu.org>
parents:
8834
diff
changeset
|
908 #define store_frame_title(str, mincol, maxcol) 0 |
|
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
909 #endif |
| 277 | 910 |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
911 /* Prepare for redisplay by updating menu-bar item lists when appropriate. |
| 11499 | 912 This can call eval. */ |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
913 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
914 void |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
915 prepare_menu_bars () |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
916 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
917 register struct window *w = XWINDOW (selected_window); |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
918 int all_windows; |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
919 struct gcpro gcpro1, gcpro2; |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
920 |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
921 all_windows = (update_mode_lines || buffer_shared > 1 |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
922 || windows_or_buffers_changed); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
923 |
|
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
924 /* Update all frame titles based on their buffer names, etc. |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
925 We do this before the menu bars so that the buffer-menu |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
926 will show the up-to-date frame titles. |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
927 |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
928 This used to be done after the menu bars, for a reason that |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
929 was stated as follows but which I do not understand: |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
930 "We do this after the menu bars so that the frame will first |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
931 create its menu bar using the name `emacs' if no other name |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
932 has yet been specified." |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
933 I think that is no longer a concern. */ |
|
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
934 #ifdef HAVE_WINDOW_SYSTEM |
|
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
935 if (windows_or_buffers_changed || update_mode_lines) |
|
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
936 { |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
937 Lisp_Object tail, frame; |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
938 |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
939 FOR_EACH_FRAME (tail, frame) |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
940 if (FRAME_VISIBLE_P (XFRAME (frame)) |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
941 || FRAME_ICONIFIED_P (XFRAME (frame))) |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
942 x_consider_frame_title (frame); |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
943 } |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
944 #endif |
|
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
945 |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
946 /* Update the menu bar item lists, if appropriate. |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
947 This has to be done before any actual redisplay |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
948 or generation of display lines. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
949 if (all_windows) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
950 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
951 Lisp_Object tail, frame; |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
952 int count = specpdl_ptr - specpdl; |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
953 |
|
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
954 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
955 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
956 FOR_EACH_FRAME (tail, frame) |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
957 { |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
958 /* If a window on this frame changed size, |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
959 report that to the user and clear the size-change flag. */ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
960 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame))) |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
961 { |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
962 Lisp_Object functions; |
|
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
963 /* Clear flag first in case we get error below. */ |
|
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
964 FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)) = 0; |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
965 functions = Vwindow_size_change_functions; |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
966 GCPRO2 (tail, functions); |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
967 while (CONSP (functions)) |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
968 { |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
969 call1 (XCONS (functions)->car, frame); |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
970 functions = XCONS (functions)->cdr; |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
971 } |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
972 UNGCPRO; |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
973 } |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
974 GCPRO1 (tail); |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
975 update_menu_bar (XFRAME (frame), 0); |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
976 UNGCPRO; |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
977 } |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
978 |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
979 unbind_to (count, Qnil); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
980 } |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
981 else |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
982 update_menu_bar (selected_frame, 1); |
|
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
983 |
|
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
984 /* Motif needs this. See comment in xmenu.c. |
|
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
985 Turn it off when pending_menu_activation is not defined. */ |
|
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
986 #ifdef USE_X_TOOLKIT |
|
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
987 pending_menu_activation = 0; |
|
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
988 #endif |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
989 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
990 |
| 769 | 991 /* Do a frame update, taking possible shortcuts into account. |
| 277 | 992 This is the main external entry point for redisplay. |
| 993 | |
| 994 If the last redisplay displayed an echo area message and that | |
| 995 message is no longer requested, we clear the echo area | |
| 996 or bring back the minibuffer if that is in use. | |
| 997 | |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
998 Do not call eval from within this function. |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
999 Calls to eval after the call to echo_area_display would confuse |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1000 the display_line mechanism and would cause a crash. |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1001 Calls to eval before that point will work most of the time, |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1002 but can still lose, because this function |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1003 can be called from signal handlers; with alarms set up; |
| 277 | 1004 or with synchronous processes running. |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1005 |
| 277 | 1006 See Fcall_process; if you called it from here, it could be |
| 1007 entered recursively. */ | |
| 1008 | |
|
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1009 static int do_verify_charstarts; |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1010 |
|
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1011 /* Counter is used to clear the face cache |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1012 no more than once ever 1000 redisplays. */ |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1013 static int clear_face_cache_count; |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1014 |
|
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1015 /* Record the previous terminal frame we displayed. */ |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1016 static FRAME_PTR previous_terminal_frame; |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1017 |
| 277 | 1018 void |
| 1019 redisplay () | |
| 1020 { | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1021 redisplay_internal (0); |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1022 } |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1023 |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1024 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1025 is not in response to any user action; therefore, we should |
| 14683 | 1026 preserve the echo area. (Actually, our caller does that job.) |
| 1027 Perhaps in the future avoid recentering windows | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1028 if it is not necessary; currently that causes some problems. */ |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1029 |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1030 static void |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1031 redisplay_internal (preserve_echo_area) |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1032 int preserve_echo_area; |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1033 { |
| 277 | 1034 register struct window *w = XWINDOW (selected_window); |
| 1035 register int pause; | |
| 1036 int must_finish = 0; | |
| 1037 int all_windows; | |
| 1038 register int tlbufpos, tlendpos; | |
| 1039 struct position pos; | |
|
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1040 int number_of_visible_frames; |
| 277 | 1041 |
| 1042 if (noninteractive) | |
| 1043 return; | |
| 1044 | |
|
14559
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1045 #ifdef USE_X_TOOLKIT |
|
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1046 if (popup_activated ()) |
|
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1047 return; |
|
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1048 #endif |
|
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1049 |
|
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1050 if (! NILP (Vinhibit_redisplay)) |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1051 return; |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1052 |
|
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1053 retry: |
|
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1054 |
|
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1055 if (! FRAME_WINDOW_P (selected_frame) |
|
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1056 && previous_terminal_frame != selected_frame) |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1057 { |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1058 /* Since frames on an ASCII terminal share the same display area, |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1059 displaying a different frame means redisplay the whole thing. */ |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1060 windows_or_buffers_changed++; |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1061 SET_FRAME_GARBAGED (selected_frame); |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1062 XSETFRAME (Vterminal_frame, selected_frame); |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1063 } |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1064 previous_terminal_frame = selected_frame; |
|
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1065 |
|
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1066 /* Set the visible flags for all frames. |
|
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1067 Do this before checking for resized or garbaged frames; they want |
|
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1068 to know if their frames are visible. |
|
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1069 See the comment in frame.h for FRAME_SAMPLE_VISIBILITY. */ |
|
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1070 { |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1071 Lisp_Object tail, frame; |
|
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1072 |
|
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1073 number_of_visible_frames = 0; |
|
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1074 |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1075 FOR_EACH_FRAME (tail, frame) |
|
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1076 { |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1077 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1078 |
|
19197
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1079 if (FRAME_VISIBLE_P (XFRAME (frame))) |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1080 number_of_visible_frames++; |
|
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1081 |
|
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1082 /* Clear out all the display lines in which we will generate the |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1083 glyphs to display. */ |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1084 init_desired_glyphs (XFRAME (frame)); |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1085 } |
|
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1086 } |
|
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1087 |
| 769 | 1088 /* Notice any pending interrupt request to change frame size. */ |
| 277 | 1089 do_pending_window_change (); |
| 1090 | |
| 769 | 1091 if (frame_garbaged) |
| 277 | 1092 { |
|
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
1093 redraw_garbaged_frames (); |
| 769 | 1094 frame_garbaged = 0; |
| 277 | 1095 } |
| 1096 | |
|
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1097 prepare_menu_bars (); |
|
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1098 |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1099 if (windows_or_buffers_changed) |
| 277 | 1100 update_mode_lines++; |
| 1101 | |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1102 /* Detect case that we need to write or remove a star in the mode line. */ |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1103 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) |
| 277 | 1104 { |
| 1105 w->update_mode_line = Qt; | |
| 1106 if (buffer_shared > 1) | |
| 1107 update_mode_lines++; | |
| 1108 } | |
| 1109 | |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1110 /* If %c is in use, update it if needed. */ |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1111 if (!NILP (w->column_number_displayed) |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1112 /* This alternative quickly identifies a common case |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1113 where no change is needed. */ |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1114 && !(PT == XFASTINT (w->last_point) |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1115 && XFASTINT (w->last_modified) >= MODIFF |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1116 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1117 && XFASTINT (w->column_number_displayed) != current_column ()) |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1118 w->update_mode_line = Qt; |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1119 |
| 769 | 1120 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; |
| 277 | 1121 |
| 1122 all_windows = update_mode_lines || buffer_shared > 1; | |
| 1123 | |
| 1124 /* If specs for an arrow have changed, do thorough redisplay | |
| 1125 to ensure we remove any arrow that should no longer exist. */ | |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1126 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
1127 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1128 all_windows = 1; |
| 277 | 1129 |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1130 /* Normally the message* functions will have already displayed and |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1131 updated the echo area, but the frame may have been trashed, or |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1132 the update may have been preempted, so display the echo area |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1133 again here. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1134 if (echo_area_glyphs || previous_echo_glyphs) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1135 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1136 echo_area_display (); |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1137 must_finish = 1; |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1138 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1139 |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1140 /* If showing region, and mark has changed, must redisplay whole window. */ |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1141 if (((!NILP (Vtransient_mark_mode) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1142 && !NILP (XBUFFER (w->buffer)->mark_active)) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1143 != !NILP (w->region_showing)) |
|
3937
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
1144 || (!NILP (w->region_showing) |
|
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
1145 && !EQ (w->region_showing, |
|
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
1146 Fmarker_position (XBUFFER (w->buffer)->mark)))) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1147 this_line_bufpos = -1; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1148 |
| 277 | 1149 tlbufpos = this_line_bufpos; |
| 1150 tlendpos = this_line_endpos; | |
| 485 | 1151 if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line) |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1152 && !current_buffer->clip_changed |
| 769 | 1153 && FRAME_VISIBLE_P (XFRAME (w->frame)) |
|
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1154 && !FRAME_OBSCURED_P (XFRAME (w->frame)) |
| 277 | 1155 /* Make sure recorded data applies to current buffer, etc */ |
| 1156 && this_line_buffer == current_buffer | |
| 1157 && current_buffer == XBUFFER (w->buffer) | |
| 485 | 1158 && NILP (w->force_start) |
| 277 | 1159 /* Point must be on the line that we have info recorded about */ |
| 6705 | 1160 && PT >= tlbufpos |
| 1161 && PT <= Z - tlendpos | |
| 277 | 1162 /* All text outside that line, including its final newline, |
| 1163 must be unchanged */ | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1164 && ((XFASTINT (w->last_modified) >= MODIFF |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1165 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)) |
| 277 | 1166 || (beg_unchanged >= tlbufpos - 1 |
| 1167 && GPT >= tlbufpos | |
| 528 | 1168 /* If selective display, can't optimize |
| 1169 if the changes start at the beginning of the line. */ | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1170 && ((INTEGERP (current_buffer->selective_display) |
| 528 | 1171 && XINT (current_buffer->selective_display) > 0 |
| 1172 ? (beg_unchanged >= tlbufpos | |
| 1173 && GPT > tlbufpos) | |
| 1174 : 1)) | |
| 277 | 1175 && end_unchanged >= tlendpos |
| 1176 && Z - GPT >= tlendpos))) | |
| 1177 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1178 int tlbufpos_byte = CHAR_TO_BYTE (tlbufpos); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1179 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos_byte - 1) != '\n' |
| 277 | 1180 && (tlbufpos == ZV |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1181 || FETCH_BYTE (tlbufpos_byte) == '\n')) |
| 277 | 1182 /* Former continuation line has disappeared by becoming empty */ |
| 1183 goto cancel; | |
| 1184 else if (XFASTINT (w->last_modified) < MODIFF | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1185 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF |
| 277 | 1186 || MINI_WINDOW_P (w)) |
| 1187 { | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1188 /* We have to handle the case of continuation around a |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1189 wide-column character (See the comment in indent.c around |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1190 line 885). |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1191 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1192 For instance, in the following case: |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1193 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1194 -------- Insert -------- |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1195 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1196 J_I_ ==> J_I_ `^^' are cursors. |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1197 ^^ ^^ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1198 -------- -------- |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1199 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1200 As we have to redraw the line above, we should goto cancel. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1201 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1202 struct position val; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1203 int prevline; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1204 int opoint = PT, opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1205 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1206 scan_newline (tlbufpos, tlbufpos_byte, BEGV, BEGV_BYTE, -1, 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1207 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1208 val = *compute_motion (PT, 0, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1209 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1210 0, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1211 tlbufpos, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1212 1 << (BITS_PER_SHORT - 1), |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1213 1 << (BITS_PER_SHORT - 1), |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1214 window_internal_width (w) - 1, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1215 XINT (w->hscroll), 0, w); |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
1216 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1217 if (val.hpos != this_line_start_hpos) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1218 goto cancel; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1219 |
| 277 | 1220 cursor_vpos = -1; |
| 1221 overlay_arrow_seen = 0; | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1222 zv_strings_seen = 0; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1223 display_text_line (w, tlbufpos, tlbufpos_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1224 this_line_vpos, this_line_start_hpos, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1225 pos_tab_offset (w, tlbufpos, tlbufpos_byte), 0); |
| 277 | 1226 /* If line contains point, is not continued, |
| 1227 and ends at same distance from eob as before, we win */ | |
| 1228 if (cursor_vpos >= 0 && this_line_bufpos | |
| 1229 && this_line_endpos == tlendpos) | |
| 1230 { | |
|
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1231 /* If this is not the window's last line, |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1232 we must adjust the charstarts of the lines below. */ |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1233 if (this_line_vpos + 1 |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1234 < XFASTINT (w->top) + window_internal_height (w)) |
|
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1235 { |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1236 int left = WINDOW_LEFT_MARGIN (w); |
|
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1237 int *charstart_next_line |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1238 = FRAME_CURRENT_GLYPHS (XFRAME (WINDOW_FRAME (w)))->charstarts[this_line_vpos + 1]; |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1239 int adjust; |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1240 |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1241 if (Z - tlendpos == ZV) |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1242 /* This line ends at end of (accessible part of) buffer. |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1243 There is no newline to count. */ |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1244 adjust = Z - tlendpos - charstart_next_line[left]; |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1245 else |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1246 /* This line ends in a newline. |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1247 Must take account of the newline and the rest of the |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1248 text that follows. */ |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1249 adjust = Z - tlendpos + 1 - charstart_next_line[left]; |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1250 |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1251 adjust_window_charstarts (w, this_line_vpos, adjust); |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1252 } |
|
6619
b3631c88ec7e
(redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents:
6612
diff
changeset
|
1253 |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1254 if (!WINDOW_FULL_WIDTH_P (w)) |
| 277 | 1255 preserve_other_columns (w); |
| 1256 goto update; | |
| 1257 } | |
| 1258 else | |
| 1259 goto cancel; | |
| 1260 } | |
|
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1261 else if (PT == XFASTINT (w->last_point) |
|
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1262 /* Make sure the cursor was last displayed |
|
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1263 in this window. Otherwise we have to reposition it. */ |
|
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1264 && XINT (w->top) <= FRAME_CURSOR_Y (selected_frame) |
|
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1265 && (XINT (w->top) + XINT (w->height) |
|
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1266 > FRAME_CURSOR_Y (selected_frame))) |
| 277 | 1267 { |
| 1268 if (!must_finish) | |
| 1269 { | |
| 1270 do_pending_window_change (); | |
| 1271 return; | |
| 1272 } | |
| 1273 goto update; | |
| 1274 } | |
|
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1275 /* If highlighting the region, or if the cursor is in the echo area, |
|
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1276 then we can't just move the cursor. */ |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1277 else if (! (!NILP (Vtransient_mark_mode) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1278 && !NILP (current_buffer->mark_active)) |
|
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1279 && (w == XWINDOW (current_buffer->last_selected_window) |
|
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1280 || highlight_nonselected_windows) |
|
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1281 && NILP (w->region_showing) |
|
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1282 && !cursor_in_echo_area) |
| 277 | 1283 { |
| 1284 pos = *compute_motion (tlbufpos, 0, | |
| 1285 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1286 0, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
1287 PT, 2, - (1 << (BITS_PER_SHORT - 1)), |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1288 window_internal_width (w) - 1, |
| 574 | 1289 XINT (w->hscroll), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1290 pos_tab_offset (w, tlbufpos, tlbufpos_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1291 w); |
| 277 | 1292 if (pos.vpos < 1) |
| 1293 { | |
| 11810 | 1294 int width = window_internal_width (w) - 1; |
| 769 | 1295 FRAME_CURSOR_X (selected_frame) |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1296 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width); |
| 769 | 1297 FRAME_CURSOR_Y (selected_frame) = this_line_vpos; |
| 277 | 1298 goto update; |
| 1299 } | |
| 1300 else | |
| 1301 goto cancel; | |
| 1302 } | |
| 1303 cancel: | |
| 1304 /* Text changed drastically or point moved off of line */ | |
| 769 | 1305 cancel_line (this_line_vpos, selected_frame); |
| 277 | 1306 } |
| 1307 | |
| 1308 this_line_bufpos = 0; | |
| 1309 all_windows |= buffer_shared > 1; | |
| 1310 | |
|
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1311 clear_face_cache_count++; |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1312 |
| 277 | 1313 if (all_windows) |
| 1314 { | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1315 Lisp_Object tail, frame; |
| 277 | 1316 |
| 9572 | 1317 #ifdef HAVE_FACES |
|
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1318 /* Clear the face cache, only when we do a full redisplay |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1319 and not too often either. */ |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1320 if (clear_face_cache_count > 1000) |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1321 { |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1322 clear_face_cache (); |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1323 clear_face_cache_count = 0; |
|
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1324 } |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1325 #endif |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1326 |
| 277 | 1327 /* Recompute # windows showing selected buffer. |
| 433 | 1328 This will be incremented each time such a window is displayed. */ |
| 277 | 1329 buffer_shared = 0; |
| 1330 | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1331 FOR_EACH_FRAME (tail, frame) |
|
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1332 { |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1333 FRAME_PTR f = XFRAME (frame); |
|
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1334 if (FRAME_WINDOW_P (f) || f == selected_frame) |
|
10769
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1335 { |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1336 |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1337 /* Mark all the scroll bars to be removed; we'll redeem the ones |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1338 we want when we redisplay their windows. */ |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1339 if (condemn_scroll_bars_hook) |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1340 (*condemn_scroll_bars_hook) (f); |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1341 |
|
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1342 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
|
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1343 redisplay_windows (FRAME_ROOT_WINDOW (f), preserve_echo_area); |
|
10769
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1344 |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1345 /* Any scroll bars which redisplay_windows should have nuked |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1346 should now go away. */ |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1347 if (judge_scroll_bars_hook) |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1348 (*judge_scroll_bars_hook) (f); |
|
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1349 } |
|
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1350 } |
| 277 | 1351 } |
|
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1352 else if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
| 277 | 1353 { |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1354 redisplay_window (selected_window, 1, preserve_echo_area); |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1355 if (!WINDOW_FULL_WIDTH_P (w)) |
| 277 | 1356 preserve_other_columns (w); |
| 1357 } | |
| 1358 | |
| 1359 update: | |
| 1360 /* Prevent various kinds of signals during display update. | |
| 1361 stdio is not robust about handling signals, | |
| 1362 which can cause an apparent I/O error. */ | |
| 1363 if (interrupt_input) | |
| 1364 unrequest_sigio (); | |
| 1365 stop_polling (); | |
| 1366 | |
| 1367 if (all_windows) | |
| 1368 { | |
| 1369 Lisp_Object tail; | |
| 1370 | |
| 1371 pause = 0; | |
| 1372 | |
| 769 | 1373 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
| 277 | 1374 { |
| 769 | 1375 FRAME_PTR f; |
| 277 | 1376 |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1377 if (!FRAMEP (XCONS (tail)->car)) |
| 277 | 1378 continue; |
| 1379 | |
| 769 | 1380 f = XFRAME (XCONS (tail)->car); |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
1381 |
|
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1382 if ((FRAME_WINDOW_P (f) || f == selected_frame) |
|
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1383 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
| 277 | 1384 { |
| 769 | 1385 pause |= update_frame (f, 0, 0); |
| 277 | 1386 if (!pause) |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1387 { |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1388 mark_window_display_accurate (f->root_window, 1); |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1389 if (frame_up_to_date_hook != 0) |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1390 (*frame_up_to_date_hook) (f); |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1391 } |
| 277 | 1392 } |
| 1393 } | |
| 1394 } | |
| 1395 else | |
| 368 | 1396 { |
|
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1397 if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
| 769 | 1398 pause = update_frame (selected_frame, 0, 0); |
|
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1399 else |
|
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1400 pause = 0; |
|
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1401 |
| 433 | 1402 /* We may have called echo_area_display at the top of this |
| 769 | 1403 function. If the echo area is on another frame, that may |
| 1404 have put text on a frame other than the selected one, so the | |
| 1405 above call to update_frame would not have caught it. Catch | |
| 433 | 1406 it here. */ |
| 1407 { | |
|
12792
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1408 Lisp_Object mini_window; |
|
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1409 FRAME_PTR mini_frame; |
|
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1410 |
|
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1411 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
|
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1412 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
| 433 | 1413 |
|
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1414 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame)) |
| 769 | 1415 pause |= update_frame (mini_frame, 0, 0); |
| 433 | 1416 } |
| 368 | 1417 } |
| 277 | 1418 |
| 769 | 1419 /* If frame does not match, prevent doing single-line-update next time. |
| 277 | 1420 Also, don't forget to check every line to update the arrow. */ |
| 1421 if (pause) | |
| 1422 { | |
| 1423 this_line_bufpos = 0; | |
| 485 | 1424 if (!NILP (last_arrow_position)) |
| 277 | 1425 { |
| 1426 last_arrow_position = Qt; | |
| 1427 last_arrow_string = Qt; | |
| 1428 } | |
| 769 | 1429 /* If we pause after scrolling, some lines in current_frame |
| 277 | 1430 may be null, so preserve_other_columns won't be able to |
| 1431 preserve all the vertical-bar separators. So, avoid using it | |
| 1432 in that case. */ | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1433 if (!WINDOW_FULL_WIDTH_P (w)) |
| 277 | 1434 update_mode_lines = 1; |
| 1435 } | |
| 1436 | |
| 769 | 1437 /* Now text on frame agrees with windows, so |
| 277 | 1438 put info into the windows for partial redisplay to follow */ |
| 1439 | |
| 1440 if (!pause) | |
| 1441 { | |
| 1442 register struct buffer *b = XBUFFER (w->buffer); | |
| 1443 | |
| 1444 blank_end_of_window = 0; | |
| 1445 unchanged_modified = BUF_MODIFF (b); | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1446 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b); |
| 277 | 1447 beg_unchanged = BUF_GPT (b) - BUF_BEG (b); |
| 1448 end_unchanged = BUF_Z (b) - BUF_GPT (b); | |
| 1449 | |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1450 /* Record the last place cursor was displayed in this window. |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1451 But not if cursor is in the echo area, because in that case |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1452 FRAME_CURSOR_X and FRAME_CURSOR_Y are in the echo area. */ |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1453 if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (selected_frame) |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1454 && EQ (FRAME_MINIBUF_WINDOW (selected_frame), minibuf_window))) |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1455 { |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1456 XSETFASTINT (w->last_point, BUF_PT (b)); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1457 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (selected_frame)); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1458 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame)); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1459 } |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1460 else |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1461 /* Make last_point invalid, since we don't really know |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1462 where the cursor would be if it were not in the echo area. */ |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1463 XSETINT (w->last_point, -1); |
| 277 | 1464 |
| 1465 if (all_windows) | |
|
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
1466 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); |
| 277 | 1467 else |
| 1468 { | |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1469 b->clip_changed = 0; |
| 277 | 1470 w->update_mode_line = Qnil; |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1471 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1472 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1473 w->last_had_star |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1474 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1475 ? Qt : Qnil); |
|
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1476 |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1477 /* Record if we are showing a region, so can make sure to |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1478 update it fully at next redisplay. */ |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1479 w->region_showing = (!NILP (Vtransient_mark_mode) |
|
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1480 && (w == XWINDOW (current_buffer->last_selected_window) |
|
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1481 || highlight_nonselected_windows) |
|
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1482 && !NILP (XBUFFER (w->buffer)->mark_active) |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1483 ? Fmarker_position (XBUFFER (w->buffer)->mark) |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1484 : Qnil); |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1485 |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1486 w->window_end_valid = w->buffer; |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1487 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
| 277 | 1488 last_arrow_string = Voverlay_arrow_string; |
|
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1489 if (do_verify_charstarts) |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1490 verify_charstarts (w); |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1491 if (frame_up_to_date_hook != 0) |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1492 (*frame_up_to_date_hook) (selected_frame); |
| 277 | 1493 } |
| 1494 update_mode_lines = 0; | |
| 1495 windows_or_buffers_changed = 0; | |
| 1496 } | |
| 1497 | |
| 1498 /* Start SIGIO interrupts coming again. | |
| 1499 Having them off during the code above | |
| 1500 makes it less likely one will discard output, | |
| 1501 but not impossible, since there might be stuff | |
| 1502 in the system buffer here. | |
| 1503 But it is much hairier to try to do anything about that. */ | |
| 1504 | |
| 1505 if (interrupt_input) | |
| 1506 request_sigio (); | |
| 1507 start_polling (); | |
| 1508 | |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1509 /* If something has become visible now which was not before, |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1510 redisplay again, so that we get them. */ |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1511 if (!pause) |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1512 { |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1513 Lisp_Object tail, frame; |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1514 int new_count = 0; |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1515 |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1516 FOR_EACH_FRAME (tail, frame) |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1517 { |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1518 int this_is_visible = 0; |
|
19197
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1519 |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1520 if (XFRAME (frame)->visible) |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1521 this_is_visible = 1; |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1522 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1523 if (XFRAME (frame)->visible) |
|
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1524 this_is_visible = 1; |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1525 |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1526 if (this_is_visible) |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1527 new_count++; |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1528 } |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1529 |
|
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1530 if (new_count != number_of_visible_frames) |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1531 windows_or_buffers_changed++; |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1532 } |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1533 |
| 769 | 1534 /* Change frame size now if a change is pending. */ |
| 277 | 1535 do_pending_window_change (); |
|
7752
7b1a7e4c7694
(redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents:
7473
diff
changeset
|
1536 |
|
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1537 /* If we just did a pending size change, or have additional |
|
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1538 visible frames, redisplay again. */ |
|
7757
8d27747de7ca
(redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents:
7752
diff
changeset
|
1539 if (windows_or_buffers_changed && !pause) |
|
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1540 goto retry; |
| 277 | 1541 } |
| 1542 | |
| 1543 /* Redisplay, but leave alone any recent echo area message | |
| 1544 unless another message has been requested in its place. | |
| 1545 | |
| 1546 This is useful in situations where you need to redisplay but no | |
| 1547 user action has occurred, making it inappropriate for the message | |
| 1548 area to be cleared. See tracking_off and | |
| 1549 wait_reading_process_input for examples of these situations. */ | |
| 1550 | |
|
20363
f3c322901601
(redisplay_preserve_echo_area): Declare it as void.
Kenichi Handa <handa@m17n.org>
parents:
20259
diff
changeset
|
1551 void |
| 277 | 1552 redisplay_preserve_echo_area () |
| 1553 { | |
| 1554 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0) | |
| 1555 { | |
| 1556 echo_area_glyphs = previous_echo_glyphs; | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1557 redisplay_internal (1); |
| 277 | 1558 echo_area_glyphs = 0; |
| 1559 } | |
| 1560 else | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1561 redisplay_internal (1); |
| 277 | 1562 } |
| 1563 | |
| 1564 void | |
| 1565 mark_window_display_accurate (window, flag) | |
| 1566 Lisp_Object window; | |
| 1567 int flag; | |
| 1568 { | |
| 1569 register struct window *w; | |
| 1570 | |
| 485 | 1571 for (;!NILP (window); window = w->next) |
| 277 | 1572 { |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1573 if (!WINDOWP (window)) abort (); |
| 277 | 1574 w = XWINDOW (window); |
| 1575 | |
| 485 | 1576 if (!NILP (w->buffer)) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1577 { |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1578 XSETFASTINT (w->last_modified, |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1579 !flag ? 0 : BUF_MODIFF (XBUFFER (w->buffer))); |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1580 XSETFASTINT (w->last_overlay_modified, |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1581 !flag ? 0 : BUF_OVERLAY_MODIFF (XBUFFER (w->buffer))); |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1582 w->last_had_star |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1583 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1584 ? Qt : Qnil); |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1585 |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1586 /* Record if we are showing a region, so can make sure to |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1587 update it fully at next redisplay. */ |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1588 w->region_showing = (!NILP (Vtransient_mark_mode) |
|
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1589 && (w == XWINDOW (current_buffer->last_selected_window) |
|
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1590 || highlight_nonselected_windows) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1591 && !NILP (XBUFFER (w->buffer)->mark_active) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1592 ? Fmarker_position (XBUFFER (w->buffer)->mark) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1593 : Qnil); |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1594 } |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1595 |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1596 w->window_end_valid = w->buffer; |
| 277 | 1597 w->update_mode_line = Qnil; |
|
14263
082e86e9bca3
(mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents:
14206
diff
changeset
|
1598 if (!NILP (w->buffer) && flag) |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1599 XBUFFER (w->buffer)->clip_changed = 0; |
| 277 | 1600 |
| 485 | 1601 if (!NILP (w->vchild)) |
| 277 | 1602 mark_window_display_accurate (w->vchild, flag); |
| 485 | 1603 if (!NILP (w->hchild)) |
| 277 | 1604 mark_window_display_accurate (w->hchild, flag); |
| 1605 } | |
| 1606 | |
| 1607 if (flag) | |
| 1608 { | |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1609 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
| 277 | 1610 last_arrow_string = Voverlay_arrow_string; |
| 1611 } | |
| 1612 else | |
| 1613 { | |
| 1614 /* t is unequal to any useful value of Voverlay_arrow_... */ | |
| 1615 last_arrow_position = Qt; | |
| 1616 last_arrow_string = Qt; | |
| 1617 } | |
| 1618 } | |
| 1619 | |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1620 /* Update the menu bar item list for frame F. |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1621 This has to be done before we start to fill in any display lines, |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1622 because it can call eval. |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1623 |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1624 If SAVE_MATCH_DATA is 1, we must save and restore it here. */ |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1625 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1626 static void |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1627 update_menu_bar (f, save_match_data) |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1628 FRAME_PTR f; |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1629 int save_match_data; |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1630 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1631 struct buffer *old = current_buffer; |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1632 Lisp_Object window; |
|
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1633 register struct window *w; |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1634 |
|
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1635 window = FRAME_SELECTED_WINDOW (f); |
|
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1636 w = XWINDOW (window); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1637 |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1638 if (update_mode_lines) |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1639 w->update_mode_line = Qt; |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1640 |
|
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
1641 if (FRAME_WINDOW_P (f) |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1642 ? |
|
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
1643 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
|
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1644 FRAME_EXTERNAL_MENU_BAR (f) |
|
5676
b5027523c90d
Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5658
diff
changeset
|
1645 #else |
|
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1646 FRAME_MENU_BAR_LINES (f) > 0 |
|
5676
b5027523c90d
Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5658
diff
changeset
|
1647 #endif |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1648 : FRAME_MENU_BAR_LINES (f) > 0) |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1649 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1650 /* If the user has switched buffers or windows, we need to |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1651 recompute to reflect the new bindings. But we'll |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1652 recompute when update_mode_lines is set too; that means |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1653 that people can use force-mode-line-update to request |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1654 that the menu bar be recomputed. The adverse effect on |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1655 the rest of the redisplay algorithm is about the same as |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1656 windows_or_buffers_changed anyway. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1657 if (windows_or_buffers_changed |
|
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1658 || !NILP (w->update_mode_line) |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1659 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1660 < BUF_MODIFF (XBUFFER (w->buffer))) |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1661 != !NILP (w->last_had_star)) |
|
12022
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1662 || ((!NILP (Vtransient_mark_mode) |
|
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1663 && !NILP (XBUFFER (w->buffer)->mark_active)) |
|
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1664 != !NILP (w->region_showing))) |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1665 { |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1666 struct buffer *prev = current_buffer; |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1667 int count = specpdl_ptr - specpdl; |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1668 |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1669 set_buffer_internal_1 (XBUFFER (w->buffer)); |
|
12017
0d73575a1c0e
(update_menu_bar): Reverse test of save_match_data.
Karl Heuer <kwzh@gnu.org>
parents:
11971
diff
changeset
|
1670 if (save_match_data) |
|
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
1671 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1672 if (NILP (Voverriding_local_map_menu_flag)) |
|
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1673 { |
|
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1674 specbind (Qoverriding_terminal_local_map, Qnil); |
|
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1675 specbind (Qoverriding_local_map, Qnil); |
|
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1676 } |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1677 |
|
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1678 /* Run the Lucid hook. */ |
|
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1679 call1 (Vrun_hooks, Qactivate_menubar_hook); |
|
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1680 /* If it has changed current-menubar from previous value, |
|
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1681 really recompute the menubar from the value. */ |
|
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1682 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
|
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1683 call0 (Qrecompute_lucid_menubar); |
| 14299 | 1684 safe_run_hooks (Qmenu_bar_update_hook); |
|
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
1685 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1686 /* Redisplay the menu bar in case we changed it. */ |
|
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
1687 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
|
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
1688 if (FRAME_WINDOW_P (f)) |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1689 set_frame_menubar (f, 0, 0); |
|
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1690 else |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1691 /* On a terminal screen, the menu bar is an ordinary screen |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1692 line, and this makes it get updated. */ |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1693 w->update_mode_line = Qt; |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1694 #else /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1695 /* In the non-toolkit version, the menu bar is an ordinary screen |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1696 line, and this makes it get updated. */ |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1697 w->update_mode_line = Qt; |
|
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1698 #endif /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
|
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1699 |
|
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1700 unbind_to (count, Qnil); |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1701 set_buffer_internal_1 (prev); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1702 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1703 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1704 } |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1705 |
| 277 | 1706 int do_id = 1; |
| 1707 | |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1708 /* Redisplay WINDOW and its subwindows and siblings. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1709 |
| 277 | 1710 static void |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1711 redisplay_windows (window, preserve_echo_area) |
| 277 | 1712 Lisp_Object window; |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1713 int preserve_echo_area; |
| 277 | 1714 { |
| 485 | 1715 for (; !NILP (window); window = XWINDOW (window)->next) |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1716 redisplay_window (window, 0, preserve_echo_area); |
| 277 | 1717 } |
| 1718 | |
|
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1719 /* Return value in display table DP (Lisp_Char_Table *) for character |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1720 C. Since a display table doesn't have any parent, we don't have to |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1721 follow parent. Do not call this function directly but use the |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1722 macro DISP_CHAR_VECTOR. */ |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1723 Lisp_Object |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1724 disp_char_vector (dp, c) |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1725 struct Lisp_Char_Table *dp; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1726 int c; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1727 { |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1728 int code[4], i; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1729 Lisp_Object val; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1730 |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1731 if (SINGLE_BYTE_CHAR_P (c)) return (dp->contents[c]); |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1732 |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1733 SPLIT_NON_ASCII_CHAR (c, code[0], code[1], code[2]); |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1734 if (code[0] != CHARSET_COMPOSITION) |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1735 { |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1736 if (code[1] < 32) code[1] = -1; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1737 else if (code[2] < 32) code[2] = -1; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1738 } |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1739 /* Here, the possible range of CODE[0] (== charset ID) is |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1740 128..MAX_CHARSET. Since the top level char table contains data |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1741 for multibyte characters after 256th element, we must increment |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1742 CODE[0] by 128 to get a correct index. */ |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1743 code[0] += 128; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1744 code[3] = -1; /* anchor */ |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1745 |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1746 for (i = 0; code[i] >= 0; i++, dp = XCHAR_TABLE (val)) |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1747 { |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1748 val = dp->contents[code[i]]; |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1749 if (!SUB_CHAR_TABLE_P (val)) |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1750 return (NILP (val) ? dp->defalt : val); |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1751 } |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1752 /* Here, VAL is a sub char table. We return the default value of it. */ |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1753 return (dp->defalt); |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1754 } |
|
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1755 |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1756 /* Redisplay window WINDOW and its subwindows. */ |
|
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1757 |
| 277 | 1758 static void |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1759 redisplay_window (window, just_this_one, preserve_echo_area) |
| 277 | 1760 Lisp_Object window; |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1761 int just_this_one, preserve_echo_area; |
| 277 | 1762 { |
| 1763 register struct window *w = XWINDOW (window); | |
|
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1764 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
| 277 | 1765 int height; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1766 int lpoint = PT; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1767 int lpoint_byte = PT_BYTE; |
| 277 | 1768 struct buffer *old = current_buffer; |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1769 register int width = window_internal_width (w) - 1; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1770 register int startp, startp_byte; |
| 277 | 1771 register int hscroll = XINT (w->hscroll); |
| 1772 struct position pos; | |
| 6705 | 1773 int opoint = PT; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1774 int opoint_byte = PT_BYTE; |
| 277 | 1775 int tem; |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1776 int update_mode_line; |
|
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1777 struct Lisp_Char_Table *dp = window_display_table (w); |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1778 int really_switched_buffer = 0; |
|
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1779 int count = specpdl_ptr - specpdl; |
| 277 | 1780 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1781 if (Z == Z_BYTE && lpoint != lpoint_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1782 abort (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1783 if (lpoint_byte < lpoint) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1784 abort (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1785 |
| 769 | 1786 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
| 277 | 1787 |
| 1788 /* If this is a combination window, do its children; that's all. */ | |
| 1789 | |
| 485 | 1790 if (!NILP (w->vchild)) |
| 277 | 1791 { |
|
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1792 redisplay_windows (w->vchild, preserve_echo_area); |
| 277 | 1793 return; |
| 1794 } | |
| 485 | 1795 if (!NILP (w->hchild)) |
| 277 | 1796 { |
|
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1797 redisplay_windows (w->hchild, preserve_echo_area); |
| 277 | 1798 return; |
| 1799 } | |
| 485 | 1800 if (NILP (w->buffer)) |
| 277 | 1801 abort (); |
|
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1802 |
|
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1803 specbind (Qinhibit_point_motion_hooks, Qt); |
|
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1804 |
| 433 | 1805 height = window_internal_height (w); |
|
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1806 update_mode_line = (!NILP (w->update_mode_line) || update_mode_lines); |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1807 if (XBUFFER (w->buffer)->clip_changed) |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1808 update_mode_line = 1; |
| 433 | 1809 |
| 1810 if (MINI_WINDOW_P (w)) | |
| 1811 { | |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1812 if (w == XWINDOW (echo_area_window) && echo_area_glyphs) |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1813 /* We've already displayed the echo area glyphs in this window. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1814 goto finish_scroll_bars; |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1815 else if (w != XWINDOW (minibuf_window)) |
| 433 | 1816 { |
|
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1817 /* This is a minibuffer, but it's not the currently active one, |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1818 so clear it. */ |
|
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1819 int vpos = XFASTINT (w->top); |
| 433 | 1820 int i; |
| 1821 | |
| 1822 for (i = 0; i < height; i++) | |
| 1823 { | |
| 769 | 1824 get_display_line (f, vpos + i, 0); |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1825 display_string (w, vpos + i, "", 0, |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1826 FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
1827 0, 1, 0, width, 0); |
| 433 | 1828 } |
| 1829 | |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1830 goto finish_scroll_bars; |
| 433 | 1831 } |
| 1832 } | |
| 277 | 1833 |
| 1834 /* Otherwise set up data on this window; select its buffer and point value */ | |
| 1835 | |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1836 if (update_mode_line) |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1837 /* Really select the buffer, for the sake of buffer-local variables. */ |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1838 { |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1839 set_buffer_internal_1 (XBUFFER (w->buffer)); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1840 really_switched_buffer = 1; |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1841 } |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1842 else |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1843 set_buffer_temp (XBUFFER (w->buffer)); |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1844 |
| 6705 | 1845 opoint = PT; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1846 opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1847 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1848 if (Z == Z_BYTE && opoint != opoint_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1849 abort (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1850 if (opoint_byte < opoint) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1851 abort (); |
| 277 | 1852 |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1853 /* If %c is in mode line, update it if needed. */ |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1854 if (!NILP (w->column_number_displayed) |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1855 /* This alternative quickly identifies a common case |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1856 where no change is needed. */ |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1857 && !(PT == XFASTINT (w->last_point) |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1858 && XFASTINT (w->last_modified) >= MODIFF |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1859 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1860 && XFASTINT (w->column_number_displayed) != current_column ()) |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1861 update_mode_line = 1; |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1862 |
|
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1863 /* Count number of windows showing the selected buffer. |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1864 An indirect buffer counts as its base buffer. */ |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1865 |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1866 if (!just_this_one) |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1867 { |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1868 struct buffer *current_base, *window_base; |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1869 current_base = current_buffer; |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1870 window_base = XBUFFER (XWINDOW (selected_window)->buffer); |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1871 if (current_base->base_buffer) |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1872 current_base = current_base->base_buffer; |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1873 if (window_base->base_buffer) |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1874 window_base = window_base->base_buffer; |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1875 if (current_base == window_base) |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1876 buffer_shared++; |
|
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1877 } |
| 277 | 1878 |
| 1879 /* POINT refers normally to the selected window. | |
| 1880 For any other window, set up appropriate value. */ | |
| 1881 | |
| 1882 if (!EQ (window, selected_window)) | |
| 1883 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1884 int new_pt = XMARKER (w->pointm)->charpos; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1885 int new_pt_byte = marker_byte_position (w->pointm); |
|
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1886 if (new_pt < BEGV) |
| 277 | 1887 { |
|
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1888 new_pt = BEGV; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1889 new_pt_byte = BEGV_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1890 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
| 277 | 1891 } |
|
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1892 else if (new_pt > (ZV - 1)) |
| 277 | 1893 { |
|
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1894 new_pt = ZV; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1895 new_pt_byte = ZV_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1896 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
| 277 | 1897 } |
|
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1898 /* We don't use SET_PT so that the point-motion hooks don't run. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1899 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
| 277 | 1900 } |
| 1901 | |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1902 /* If any of the character widths specified in the display table |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1903 have changed, invalidate the width run cache. It's true that this |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1904 may be a bit late to catch such changes, but the rest of |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1905 redisplay goes (non-fatally) haywire when the display table is |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1906 changed, so why should we worry about doing any better? */ |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1907 if (current_buffer->width_run_cache) |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1908 { |
|
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1909 struct Lisp_Char_Table *disptab = buffer_display_table (); |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1910 |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1911 if (! disptab_matches_widthtab (disptab, |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1912 XVECTOR (current_buffer->width_table))) |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1913 { |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1914 invalidate_region_cache (current_buffer, |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1915 current_buffer->width_run_cache, |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1916 BEG, Z); |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1917 recompute_width_table (current_buffer, disptab); |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1918 } |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1919 } |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1920 |
| 277 | 1921 /* If window-start is screwed up, choose a new one. */ |
| 1922 if (XMARKER (w->start)->buffer != current_buffer) | |
| 1923 goto recenter; | |
| 1924 | |
| 1925 startp = marker_position (w->start); | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1926 startp_byte = marker_byte_position (w->start); |
| 277 | 1927 |
|
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1928 /* If someone specified a new starting point but did not insist, |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1929 check whether it can be used. */ |
|
22148
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
1930 if (!NILP (w->optional_new_start) |
|
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
1931 && startp >= BEGV && startp <= ZV) |
|
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1932 { |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1933 w->optional_new_start = Qnil; |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1934 /* Check whether this start pos is usable given where point is. */ |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1935 |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1936 pos = *compute_motion (startp, 0, |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1937 (((EQ (window, minibuf_window) |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1938 && startp == BEG) |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1939 ? minibuf_prompt_width : 0) |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1940 + (hscroll ? 1 - hscroll : 0)), |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1941 0, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1942 PT, height, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1943 /* BUG FIX: See the comment of |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1944 Fpos_visible_in_window_p (window.c). */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1945 - (1 << (BITS_PER_SHORT - 1)), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1946 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1947 pos_tab_offset (w, startp, startp_byte), w); |
|
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1948 /* If PT does fit on the screen, we will use this start pos, |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1949 so do so by setting force_start. */ |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1950 if (pos.bufpos == PT) |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1951 w->force_start = Qt; |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1952 } |
|
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1953 |
| 433 | 1954 /* Handle case where place to start displaying has been specified, |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1955 unless the specified location is outside the accessible range. */ |
| 485 | 1956 if (!NILP (w->force_start)) |
| 277 | 1957 { |
|
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1958 w->force_start = Qnil; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1959 /* Forget any recorded base line for line number display. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1960 w->base_line_number = Qnil; |
|
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
1961 /* The old bottom-of-screen position is no longer valid. */ |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
1962 w->window_end_valid = Qnil; |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1963 /* Redisplay the mode line. Select the buffer properly for that. |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1964 Also, run the hook window-scroll-functions |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1965 because we have scrolled. */ |
|
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1966 /* Note, we do this after clearing force_start because |
|
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1967 if there's an error, it is better to forget about force_start |
|
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1968 than to get into an infinite loop calling the hook functions |
|
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1969 and having them get more errors. */ |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1970 if (!update_mode_line |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1971 || ! NILP (Vwindow_scroll_functions)) |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1972 { |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1973 Lisp_Object temp[3]; |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1974 |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1975 if (!really_switched_buffer) |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1976 { |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1977 set_buffer_temp (old); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1978 set_buffer_internal_1 (XBUFFER (w->buffer)); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1979 } |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1980 really_switched_buffer = 1; |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1981 update_mode_line = 1; |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1982 w->update_mode_line = Qt; |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1983 if (! NILP (Vwindow_scroll_functions)) |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1984 { |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1985 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1986 make_number (startp)); |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1987 startp = marker_position (w->start); |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
1988 startp_byte = marker_byte_position (w->start); |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1989 } |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1990 } |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1991 XSETFASTINT (w->last_modified, 0); |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1992 XSETFASTINT (w->last_overlay_modified, 0); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1993 if (startp < BEGV) startp = BEGV, startp_byte = BEGV_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1994 if (startp > ZV) startp = ZV, startp = ZV_BYTE; |
| 277 | 1995 try_window (window, startp); |
| 1996 if (cursor_vpos < 0) | |
| 1997 { | |
| 1998 /* If point does not appear, move point so it does appear */ | |
| 1999 pos = *compute_motion (startp, 0, | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2000 (((EQ (window, minibuf_window) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2001 && startp == BEG) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2002 ? minibuf_prompt_width : 0) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2003 + (hscroll ? 1 - hscroll : 0)), |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2004 0, |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2005 ZV, height / 2, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2006 - (1 << (BITS_PER_SHORT - 1)), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2007 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2008 pos_tab_offset (w, startp, startp_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2009 w); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2010 TEMP_SET_PT_BOTH (pos.bufpos, pos.bytepos); |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2011 if (w != XWINDOW (selected_window)) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2012 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
| 277 | 2013 else |
| 2014 { | |
|
5340
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
2015 if (current_buffer == old) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2016 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2017 lpoint = PT; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2018 lpoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2019 } |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2020 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
| 11810 | 2021 + minmax (0, pos.hpos, width)); |
| 769 | 2022 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
| 277 | 2023 } |
|
9218
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
2024 /* If we are highlighting the region, |
|
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
2025 then we just changed the region, so redisplay to show it. */ |
|
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
2026 if (!NILP (Vtransient_mark_mode) |
|
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
2027 && !NILP (current_buffer->mark_active)) |
|
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2028 { |
|
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2029 cancel_my_columns (XWINDOW (window)); |
|
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2030 try_window (window, startp); |
|
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2031 } |
| 277 | 2032 } |
| 2033 goto done; | |
| 2034 } | |
| 2035 | |
| 2036 /* Handle case where text has not changed, only point, | |
|
14178
4c8fdbefbb58
(redisplay_window): Fix minor bug in Fset_marker call.
Richard M. Stallman <rms@gnu.org>
parents:
14133
diff
changeset
|
2037 and it has not moved off the frame. */ |
| 277 | 2038 |
| 2039 /* This code is not used for minibuffer for the sake of | |
| 2040 the case of redisplaying to replace an echo area message; | |
| 2041 since in that case the minibuffer contents per se are usually unchanged. | |
| 2042 This code is of no real use in the minibuffer since | |
| 2043 the handling of this_line_bufpos, etc., | |
| 2044 in redisplay handles the same cases. */ | |
| 2045 | |
| 2046 if (XFASTINT (w->last_modified) >= MODIFF | |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2047 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF |
|
12493
f8ada5acbaec
(redisplay_window): Fix typos in clip_changed change.
Richard M. Stallman <rms@gnu.org>
parents:
12472
diff
changeset
|
2048 && PT >= startp && !current_buffer->clip_changed |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2049 && (just_this_one || WINDOW_FULL_WIDTH_P (w)) |
|
11085
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
2050 /* If force-mode-line-update was called, really redisplay; |
|
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
2051 that's how redisplay is forced after e.g. changing |
|
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
2052 buffer-invisibility-spec. */ |
|
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
2053 && NILP (w->update_mode_line) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2054 /* Can't use this case if highlighting a region. */ |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2055 && !(!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2056 && NILP (w->region_showing) |
|
7927
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
2057 /* If end pos is out of date, scroll bar and percentage will be wrong */ |
|
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
2058 && INTEGERP (w->window_end_vpos) |
|
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
2059 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height) |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
2060 && !EQ (window, minibuf_window) |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2061 && (!MARKERP (Voverlay_arrow_position) |
|
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2062 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
| 277 | 2063 { |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2064 /* All positions in this clause are relative to the window edge. */ |
|
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2065 |
|
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2066 int this_scroll_margin = scroll_margin; |
|
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
2067 int last_point_y = XFASTINT (w->last_point_y) - XINT (w->top); |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2068 int last_point_x = (XFASTINT (w->last_point_x) - WINDOW_LEFT_MARGIN (w)); |
|
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2069 |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2070 /* Find where PT is located now on the frame. */ |
|
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2071 /* Check just_this_one as a way of verifying that the |
|
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2072 window edges have not changed. */ |
|
22011
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2073 if (PT == XFASTINT (w->last_point) && just_this_one |
|
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2074 /* If CURSOR_IN_ECHO_AREA, last_point_x and last_point_y |
|
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2075 refer to the echo area and are not related to this window. */ |
|
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2076 && ! cursor_in_echo_area) |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2077 { |
|
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2078 pos.hpos = last_point_x; |
|
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2079 pos.vpos = last_point_y; |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2080 pos.bufpos = PT; |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2081 } |
|
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
2082 else if (PT > XFASTINT (w->last_point) |
|
22011
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2083 && ! cursor_in_echo_area |
|
19478
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2084 && XFASTINT (w->last_point) > startp && just_this_one |
|
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2085 /* We can't use this if point is in the left margin of a |
|
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2086 hscrolled window, because w->last_point_x has been |
|
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2087 clipped to the window edges. */ |
|
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2088 && !(last_point_x <= 0 && hscroll)) |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2089 { |
|
21290
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2090 int last_point = XFASTINT (w->last_point); |
|
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2091 int last_point_byte = CHAR_TO_BYTE (last_point); |
|
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2092 int tab_offset = (pos_tab_offset (w, last_point, last_point_byte) |
|
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2093 - (last_point_x + hscroll - !! hscroll)); |
|
21290
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2094 |
|
24557
7bc142e9e59f
(redisplay_window): When we call compute_motion with
Kenichi Handa <handa@m17n.org>
parents:
24511
diff
changeset
|
2095 pos = *compute_motion (last_point, last_point_y, last_point_x, 1, |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2096 PT, height, |
|
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2097 /* BUG FIX: See the comment of |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2098 Fpos_visible_in_window_p (window.c). */ |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2099 - (1 << (BITS_PER_SHORT - 1)), |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2100 width, hscroll, |
|
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2101 tab_offset, |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2102 w); |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2103 } |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2104 else |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2105 { |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2106 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), 0, |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2107 PT, height, |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2108 /* BUG FIX: See the comment of |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2109 Fpos_visible_in_window_p (window.c). */ |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2110 - (1 << (BITS_PER_SHORT - 1)), |
|
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2111 width, hscroll, |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2112 pos_tab_offset (w, startp, startp_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2113 w); |
|
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2114 } |
| 277 | 2115 |
|
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2116 /* Don't use a scroll margin that is negative or too large. */ |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2117 if (this_scroll_margin < 0) |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2118 this_scroll_margin = 0; |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2119 |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2120 if (XINT (w->height) < 4 * scroll_margin) |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2121 this_scroll_margin = XINT (w->height) / 4; |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2122 |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2123 /* If point fits on the screen, and not within the scroll margin, |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2124 we are ok. */ |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2125 if (pos.vpos < height - this_scroll_margin |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2126 && (pos.vpos >= this_scroll_margin || startp == BEGV)) |
| 277 | 2127 { |
| 769 | 2128 /* Ok, point is still on frame */ |
| 2129 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
| 277 | 2130 { |
| 2131 /* These variables are supposed to be origin 1 */ | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2132 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
| 11810 | 2133 + minmax (0, pos.hpos, width)); |
| 769 | 2134 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
| 277 | 2135 } |
| 2136 /* This doesn't do the trick, because if a window to the right of | |
| 2137 this one must be redisplayed, this does nothing because there | |
| 769 | 2138 is nothing in DesiredFrame yet, and then the other window is |
| 277 | 2139 redisplayed, making likes that are empty in this window's columns. |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2140 if (WINDOW_FULL_WIDTH_P (w)) |
| 277 | 2141 preserve_my_columns (w); |
| 2142 */ | |
|
20130
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2143 if (current_buffer->clip_changed |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2144 && ! NILP (Vwindow_scroll_functions)) |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2145 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2146 make_number (marker_position (w->start))); |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2147 |
| 277 | 2148 goto done; |
| 2149 } | |
| 2150 /* Don't bother trying redisplay with same start; | |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2151 we already know it will lose. */ |
| 277 | 2152 } |
| 2153 /* If current starting point was originally the beginning of a line | |
| 2154 but no longer is, find a new starting point. */ | |
| 485 | 2155 else if (!NILP (w->start_at_line_beg) |
|
8594
4d8d02befd11
(redisplay_window): Don't access text before BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
8514
diff
changeset
|
2156 && !(startp <= BEGV |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2157 || FETCH_BYTE (startp_byte - 1) == '\n')) |
| 277 | 2158 { |
| 2159 goto recenter; | |
| 2160 } | |
| 2161 else if (just_this_one && !MINI_WINDOW_P (w) | |
| 6705 | 2162 && PT >= startp |
| 277 | 2163 && XFASTINT (w->last_modified) |
|
3648
9838d64cc5ae
* xdisp.c (redisplay_window): Don't call try_window_id if the
Jim Blandy <jimb@redhat.com>
parents:
3586
diff
changeset
|
2164 /* or else vmotion on first line won't work. */ |
|
9838d64cc5ae
* xdisp.c (redisplay_window): Don't call try_window_id if the
Jim Blandy <jimb@redhat.com>
parents:
3586
diff
changeset
|
2165 && ! NILP (w->start_at_line_beg) |
| 277 | 2166 && ! EQ (w->window_end_valid, Qnil) |
|
12493
f8ada5acbaec
(redisplay_window): Fix typos in clip_changed change.
Richard M. Stallman <rms@gnu.org>
parents:
12472
diff
changeset
|
2167 && do_id && !current_buffer->clip_changed |
| 277 | 2168 && !blank_end_of_window |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2169 && WINDOW_FULL_WIDTH_P (w) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2170 /* Can't use this case if highlighting a region. */ |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2171 && !(!NILP (Vtransient_mark_mode) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2172 && !NILP (current_buffer->mark_active)) |
|
11971
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
2173 /* Don't use try_window_id if newline |
|
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
2174 doesn't display as the end of a line. */ |
|
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
2175 && !(dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, '\n'))) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2176 && NILP (w->region_showing) |
|
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
2177 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
| 277 | 2178 && EQ (last_arrow_string, Voverlay_arrow_string) |
| 769 | 2179 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f))) |
| 277 | 2180 && tem != -2) |
| 2181 { | |
| 2182 /* tem > 0 means success. tem == -1 means choose new start. | |
| 2183 tem == -2 means try again with same start, | |
| 2184 and nothing but whitespace follows the changed stuff. | |
| 2185 tem == 0 means try again with same start. */ | |
| 2186 if (tem > 0) | |
| 2187 goto done; | |
| 2188 } | |
| 2189 else if (startp >= BEGV && startp <= ZV | |
|
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2190 && (startp < ZV |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2191 /* Avoid starting at end of buffer. */ |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2192 #if 0 /* This change causes trouble for M-! finger & RET. |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2193 It will have to be considered later. */ |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2194 || ! EQ (window, selected_window) |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2195 /* Don't do the recentering if redisplay |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2196 is not for no user action. */ |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2197 || preserve_echo_area |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2198 #endif |
|
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2199 || startp == BEGV |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2200 || (XFASTINT (w->last_modified) >= MODIFF |
|
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2201 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
| 277 | 2202 { |
| 2203 /* Try to redisplay starting at same place as before */ | |
| 769 | 2204 /* If point has not moved off frame, accept the results */ |
| 277 | 2205 try_window (window, startp); |
| 2206 if (cursor_vpos >= 0) | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2207 { |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2208 if (!just_this_one || current_buffer->clip_changed |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2209 || beg_unchanged < startp) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2210 /* Forget any recorded base line for line number display. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2211 w->base_line_number = Qnil; |
|
20130
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2212 |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2213 if (current_buffer->clip_changed |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2214 && ! NILP (Vwindow_scroll_functions)) |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2215 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2216 make_number (marker_position (w->start))); |
|
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2217 |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2218 goto done; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2219 } |
| 277 | 2220 else |
| 2221 cancel_my_columns (w); | |
| 2222 } | |
| 2223 | |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2224 XSETFASTINT (w->last_modified, 0); |
|
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2225 XSETFASTINT (w->last_overlay_modified, 0); |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2226 /* Redisplay the mode line. Select the buffer properly for that. */ |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2227 if (!update_mode_line) |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2228 { |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2229 if (!really_switched_buffer) |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2230 { |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2231 set_buffer_temp (old); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2232 set_buffer_internal_1 (XBUFFER (w->buffer)); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2233 } |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2234 update_mode_line = 1; |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2235 w->update_mode_line = Qt; |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2236 } |
| 277 | 2237 |
| 2238 /* Try to scroll by specified few lines */ | |
| 2239 | |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2240 if ((scroll_conservatively || scroll_step) |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2241 && !current_buffer->clip_changed |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2242 && startp >= BEGV && startp <= ZV) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2243 { |
|
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2244 int this_scroll_margin = scroll_margin; |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2245 int scroll_margin_pos, scroll_margin_bytepos; |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2246 int scroll_max = scroll_step; |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2247 Lisp_Object ltemp; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2248 |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2249 if (scroll_conservatively) |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2250 scroll_max = scroll_conservatively; |
|
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2251 |
|
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2252 /* Don't use a scroll margin that is negative or too large. */ |
|
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2253 if (this_scroll_margin < 0) |
|
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2254 this_scroll_margin = 0; |
|
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2255 |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2256 if (XINT (w->height) < 4 * this_scroll_margin) |
|
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2257 this_scroll_margin = XINT (w->height) / 4; |
|
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2258 |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2259 ltemp = Fwindow_end (window, Qt); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2260 scroll_margin_pos = XINT (ltemp); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2261 |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2262 if (this_scroll_margin) |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2263 { |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2264 pos = *vmotion (scroll_margin_pos, -this_scroll_margin, w); |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2265 scroll_margin_pos = pos.bufpos; |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2266 scroll_margin_bytepos = pos.bytepos; |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2267 } |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2268 else |
|
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2269 scroll_margin_bytepos = CHAR_TO_BYTE (scroll_margin_pos); |
|
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2270 |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2271 if (PT >= scroll_margin_pos) |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2272 { |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2273 struct position pos; |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2274 pos = *compute_motion (scroll_margin_pos, 0, 0, 0, |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2275 PT, XFASTINT (w->height), 0, |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2276 XFASTINT (w->width), XFASTINT (w->hscroll), |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2277 pos_tab_offset (w, scroll_margin_pos, |
|
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2278 scroll_margin_bytepos), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2279 w); |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2280 if (pos.vpos >= scroll_max) |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2281 goto scroll_fail_1; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2282 |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2283 pos = *vmotion (startp, |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2284 scroll_conservatively ? pos.vpos + 1 : scroll_step, |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2285 w); |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2286 |
|
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2287 /* The old bottom-of-screen position is no longer valid. */ |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2288 w->window_end_valid = Qnil; |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2289 if (! NILP (Vwindow_scroll_functions)) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2290 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2291 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2292 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2293 make_number (pos.bufpos)); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2294 pos.bufpos = marker_position (w->start); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2295 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2296 try_window (window, pos.bufpos); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2297 if (cursor_vpos >= 0) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2298 { |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2299 if (!just_this_one || current_buffer->clip_changed |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2300 || beg_unchanged < startp) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2301 /* Forget any recorded base line for line number display. */ |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2302 w->base_line_number = Qnil; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2303 goto done; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2304 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2305 else |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2306 cancel_my_columns (w); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2307 } |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2308 |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2309 scroll_margin_pos = startp; |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2310 if (this_scroll_margin) |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2311 { |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2312 pos = *vmotion (scroll_margin_pos, this_scroll_margin, w); |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2313 scroll_margin_pos = pos.bufpos; |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2314 } |
|
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2315 if (PT < scroll_margin_pos) |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2316 { |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2317 struct position pos; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2318 pos = *compute_motion (PT, 0, 0, 0, |
|
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2319 scroll_margin_pos, XFASTINT (w->height), 0, |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2320 XFASTINT (w->width), XFASTINT (w->hscroll), |
|
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2321 pos_tab_offset (w, PT, PT_BYTE), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2322 w); |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2323 if (pos.vpos > scroll_max) |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2324 goto scroll_fail_1; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2325 |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2326 pos = *vmotion (startp, |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2327 scroll_conservatively ? -pos.vpos : - scroll_step, |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2328 w); |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2329 |
|
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2330 /* The old bottom-of-screen position is no longer valid. */ |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2331 w->window_end_valid = Qnil; |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2332 if (! NILP (Vwindow_scroll_functions)) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2333 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2334 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2335 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2336 make_number (pos.bufpos)); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2337 pos.bufpos = marker_position (w->start); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2338 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2339 try_window (window, pos.bufpos); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2340 if (cursor_vpos >= 0) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2341 { |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2342 if (!just_this_one || current_buffer->clip_changed |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2343 || beg_unchanged < startp) |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2344 /* Forget any recorded base line for line number display. */ |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2345 w->base_line_number = Qnil; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2346 goto done; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2347 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2348 else |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2349 cancel_my_columns (w); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2350 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2351 scroll_fail_1: ; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2352 } |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2353 |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2354 #if 0 |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2355 if (scroll_step && ! scroll_margin && !current_buffer->clip_changed |
|
13760
7c7cc29b994e
(redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents:
13733
diff
changeset
|
2356 && startp >= BEGV && startp <= ZV) |
| 277 | 2357 { |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2358 if (margin_call == 0) |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2359 margin_call = (PT > startp ? 1 : -1); |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2360 if (margin_call > 0) |
| 277 | 2361 { |
| 11810 | 2362 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w); |
| 277 | 2363 if (pos.vpos >= height) |
| 2364 goto scroll_fail; | |
| 2365 } | |
| 2366 | |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2367 pos = *vmotion (startp, (margin_call < 0 ? - scroll_step : scroll_step), |
|
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2368 w); |
| 277 | 2369 |
| 6705 | 2370 if (PT >= pos.bufpos) |
| 277 | 2371 { |
|
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2372 /* The old bottom-of-screen position is no longer valid. */ |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2373 w->window_end_valid = Qnil; |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2374 |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2375 if (! NILP (Vwindow_scroll_functions)) |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2376 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2377 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2378 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2379 make_number (pos.bufpos)); |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2380 pos.bufpos = marker_position (w->start); |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2381 } |
| 277 | 2382 try_window (window, pos.bufpos); |
| 2383 if (cursor_vpos >= 0) | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2384 { |
|
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2385 if (!just_this_one || current_buffer->clip_changed |
|
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2386 || beg_unchanged < startp) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2387 /* Forget any recorded base line for line number display. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2388 w->base_line_number = Qnil; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2389 goto done; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2390 } |
| 277 | 2391 else |
| 2392 cancel_my_columns (w); | |
| 2393 } | |
| 2394 scroll_fail: ; | |
| 2395 } | |
|
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2396 #endif |
| 277 | 2397 |
| 2398 /* Finally, just choose place to start which centers point */ | |
| 2399 | |
| 2400 recenter: | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2401 /* Forget any previously recorded base line for line number display. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2402 w->base_line_number = Qnil; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2403 |
| 11810 | 2404 pos = *vmotion (PT, - (height / 2), w); |
|
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2405 |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2406 /* The minibuffer is often just one line. Ordinary scrolling |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2407 gives little overlap and looks bad. So show 20 chars before point. */ |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2408 if (height == 1 |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2409 && (pos.bufpos >= PT - minibuffer_scroll_overlap |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2410 /* If we scrolled less than 1/2 line forward, we will |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2411 get too much overlap, so change to the usual amount. */ |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2412 || pos.bufpos < startp + width / 2) |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2413 && PT > BEGV + minibuffer_scroll_overlap |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2414 /* If we scrolled to an actual line boundary, |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2415 that's different; don't ignore line boundaries. */ |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2416 && FETCH_BYTE (pos.bytepos - 1) != '\n') |
|
20580
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2417 { |
|
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2418 pos.bufpos = PT - minibuffer_scroll_overlap; |
|
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2419 pos.bytepos = CHAR_TO_BYTE (pos.bufpos); |
|
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2420 } |
|
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2421 |
|
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
2422 /* Set startp here explicitly in case that helps avoid an infinite loop |
|
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
2423 in case the window-scroll-functions functions get errors. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2424 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
|
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2425 |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2426 /* The old bottom-of-screen position is no longer valid. */ |
|
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2427 w->window_end_valid = Qnil; |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2428 if (! NILP (Vwindow_scroll_functions)) |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2429 { |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2430 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2431 make_number (pos.bufpos)); |
|
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2432 pos.bufpos = marker_position (w->start); |
|
20580
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2433 pos.bytepos = marker_byte_position (w->start); |
|
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2434 } |
| 277 | 2435 try_window (window, pos.bufpos); |
| 2436 | |
| 2437 startp = marker_position (w->start); | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2438 startp_byte = marker_byte_position (w->start); |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2439 w->start_at_line_beg |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2440 = (startp == BEGV || FETCH_BYTE (startp_byte - 1) == '\n') ? Qt : Qnil; |
| 277 | 2441 |
| 2442 done: | |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2443 if ((update_mode_line |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2444 /* If window not full width, must redo its mode line |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2445 if the window to its side is being redone */ |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2446 || (!just_this_one && !WINDOW_FULL_WIDTH_P (w)) |
|
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2447 || INTEGERP (w->base_line_pos) |
|
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2448 || (!NILP (w->column_number_displayed) |
|
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2449 && XFASTINT (w->column_number_displayed) != current_column ())) |
| 277 | 2450 && height != XFASTINT (w->height)) |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2451 { |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2452 FRAME_PTR oframe = selected_frame; |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2453 if (!really_switched_buffer) |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2454 { |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2455 set_buffer_temp (old); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2456 set_buffer_internal_1 (XBUFFER (w->buffer)); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2457 really_switched_buffer = 1; |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2458 } |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2459 selected_frame = f; |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2460 display_mode_line (w); |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2461 selected_frame = oframe; |
|
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2462 } |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2463 if (! line_number_displayed |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2464 && ! BUFFERP (w->base_line_pos)) |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2465 { |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2466 w->base_line_pos = Qnil; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2467 w->base_line_number = Qnil; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2468 } |
| 277 | 2469 |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2470 /* When we reach a frame's selected window, redo the frame's menu bar. */ |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2471 if (update_mode_line |
|
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
2472 && (FRAME_WINDOW_P (f) |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2473 ? |
|
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
2474 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2475 FRAME_EXTERNAL_MENU_BAR (f) |
|
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2476 #else |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2477 FRAME_MENU_BAR_LINES (f) > 0 |
|
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2478 #endif |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2479 : FRAME_MENU_BAR_LINES (f) > 0) |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2480 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2481 display_menu_bar (w); |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2482 |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2483 finish_scroll_bars: |
|
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2484 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2485 { |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2486 int start, end, whole; |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2487 |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2488 /* Calculate the start and end positions for the current window. |
|
2874
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2489 At some point, it would be nice to choose between scrollbars |
|
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2490 which reflect the whole buffer size, with special markers |
|
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2491 indicating narrowing, and scrollbars which reflect only the |
|
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2492 visible region. |
|
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2493 |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2494 Note that minibuffers sometimes aren't displaying any text. */ |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2495 if (! MINI_WINDOW_P (w) |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2496 || (w == XWINDOW (minibuf_window) && ! echo_area_glyphs)) |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2497 { |
|
2929
f3c44426bed2
Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
Jim Blandy <jimb@redhat.com>
parents:
2904
diff
changeset
|
2498 whole = ZV - BEGV; |
|
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2499 start = marker_position (w->start) - BEGV; |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2500 /* I don't think this is guaranteed to be right. For the |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2501 moment, we'll pretend it is. */ |
|
3880
ef6a4d39634b
* xdisp.c (redisplay_window): Remember to compute end relative to
Jim Blandy <jimb@redhat.com>
parents:
3788
diff
changeset
|
2502 end = (Z - XINT (w->window_end_pos)) - BEGV; |
|
2874
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2503 |
|
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2504 if (end < start) end = start; |
|
2929
f3c44426bed2
Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
Jim Blandy <jimb@redhat.com>
parents:
2904
diff
changeset
|
2505 if (whole < (end - start)) whole = end - start; |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2506 } |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2507 else |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2508 start = end = whole = 0; |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2509 |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2510 /* Indicate what this scroll bar ought to be displaying now. */ |
|
3788
41a297faf4ac
* xdisp.c (redisplay_window): No need to subtract one from start
Jim Blandy <jimb@redhat.com>
parents:
3750
diff
changeset
|
2511 (*set_vertical_scroll_bar_hook) (w, end - start, whole, start); |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2512 |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2513 /* Note that we actually used the scroll bar attached to this window, |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2514 so it shouldn't be deleted at the end of redisplay. */ |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2515 (*redeem_scroll_bar_hook) (w); |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2516 } |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2517 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2518 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2519 if (really_switched_buffer) |
|
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
2520 set_buffer_internal_1 (old); |
|
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2521 else |
|
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2522 set_buffer_temp (old); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2523 TEMP_SET_PT_BOTH (lpoint, lpoint_byte); |
|
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
2524 |
|
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
2525 unbind_to (count, Qnil); |
| 277 | 2526 } |
| 2527 | |
| 2528 /* Do full redisplay on one window, starting at position `pos'. */ | |
| 2529 | |
| 2530 static void | |
| 2531 try_window (window, pos) | |
| 2532 Lisp_Object window; | |
| 2533 register int pos; | |
| 2534 { | |
| 2535 register struct window *w = XWINDOW (window); | |
| 2536 register int height = window_internal_height (w); | |
| 2537 register int vpos = XFASTINT (w->top); | |
| 2538 register int last_text_vpos = vpos; | |
| 769 | 2539 FRAME_PTR f = XFRAME (w->frame); |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2540 int width = window_internal_width (w) - 1; |
| 277 | 2541 struct position val; |
| 2542 | |
|
16738
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2543 /* POS should never be out of range! */ |
|
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2544 if (pos < XBUFFER (w->buffer)->begv |
|
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2545 || pos > XBUFFER (w->buffer)->zv) |
|
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2546 abort (); |
|
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2547 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2548 if (XMARKER (w->start)->charpos != pos) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2549 Fset_marker (w->start, make_number (pos), Qnil); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2550 |
| 277 | 2551 cursor_vpos = -1; |
| 2552 overlay_arrow_seen = 0; | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2553 zv_strings_seen = 0; |
| 277 | 2554 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2555 val.ovstring_chars_done = 0; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2556 val.bytepos = marker_byte_position (w->start); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2557 val.tab_offset = pos_tab_offset (w, pos, val.bytepos); |
| 277 | 2558 |
| 2559 while (--height >= 0) | |
| 2560 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2561 val = *display_text_line (w, pos, val.bytepos, vpos, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2562 val.hpos, val.tab_offset, |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2563 val.ovstring_chars_done); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2564 /* The following code is omitted because we maintain tab_offset |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2565 in VAL. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2566 #if 0 |
| 277 | 2567 tab_offset += width; |
| 2568 if (val.vpos) tab_offset = 0; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2569 #endif /* 0 */ |
| 277 | 2570 vpos++; |
| 2571 if (pos != val.bufpos) | |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2572 { |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2573 int invis = 0; |
|
6065
ab1aef4b0e07
(try_window): Add #ifdef USE_TEXT_PROPERTIES around call to Fget_text_property.
Karl Heuer <kwzh@gnu.org>
parents:
5942
diff
changeset
|
2574 #ifdef USE_TEXT_PROPERTIES |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2575 Lisp_Object invis_prop; |
|
21534
7784f9b030a8
(try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
2576 invis_prop = Fget_char_property (make_number (val.bufpos - 1), |
|
7784f9b030a8
(try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
2577 Qinvisible, window); |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2578 invis = TEXT_PROP_MEANS_INVISIBLE (invis_prop); |
|
6065
ab1aef4b0e07
(try_window): Add #ifdef USE_TEXT_PROPERTIES around call to Fget_text_property.
Karl Heuer <kwzh@gnu.org>
parents:
5942
diff
changeset
|
2579 #endif |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2580 |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2581 last_text_vpos |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2582 /* Next line, unless prev line ended in end of buffer with no cr */ |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2583 = vpos - (val.vpos |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2584 && (FETCH_BYTE (val.bytepos - 1) != '\n' || invis)); |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2585 } |
| 277 | 2586 pos = val.bufpos; |
| 2587 } | |
| 2588 | |
| 2589 /* If last line is continued in middle of character, | |
| 769 | 2590 include the split character in the text considered on the frame */ |
| 277 | 2591 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
| 2592 pos++; | |
| 2593 | |
| 769 | 2594 /* If bottom just moved off end of frame, change mode line percentage. */ |
| 277 | 2595 if (XFASTINT (w->window_end_pos) == 0 |
| 2596 && Z != pos) | |
| 2597 w->update_mode_line = Qt; | |
| 2598 | |
| 769 | 2599 /* Say where last char on frame will be, once redisplay is finished. */ |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2600 XSETFASTINT (w->window_end_pos, Z - pos); |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2601 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top)); |
| 277 | 2602 /* But that is not valid info until redisplay finishes. */ |
| 2603 w->window_end_valid = Qnil; | |
| 2604 } | |
| 2605 | |
| 2606 /* Try to redisplay when buffer is modified locally, | |
| 2607 computing insert/delete line to preserve text outside | |
| 2608 the bounds of the changes. | |
| 2609 Return 1 if successful, 0 if if cannot tell what to do, | |
| 2610 or -1 to tell caller to find a new window start, | |
| 2611 or -2 to tell caller to do normal redisplay with same window start. */ | |
| 2612 | |
| 2613 static int | |
| 2614 try_window_id (window) | |
| 2615 Lisp_Object window; | |
| 2616 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2617 int pos, pos_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2618 int opoint, opoint_byte; |
| 277 | 2619 register struct window *w = XWINDOW (window); |
| 2620 register int height = window_internal_height (w); | |
| 769 | 2621 FRAME_PTR f = XFRAME (w->frame); |
| 277 | 2622 int top = XFASTINT (w->top); |
| 2623 int start = marker_position (w->start); | |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2624 int width = window_internal_width (w) - 1; |
| 277 | 2625 int hscroll = XINT (w->hscroll); |
| 2626 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2627 int did_motion; |
| 277 | 2628 register int vpos; |
| 2629 register int i, tem; | |
| 2630 int last_text_vpos = 0; | |
| 2631 int stop_vpos; | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2632 int selective = (INTEGERP (current_buffer->selective_display) |
|
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2633 ? XINT (current_buffer->selective_display) |
|
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2634 : !NILP (current_buffer->selective_display) ? -1 : 0); |
| 277 | 2635 struct position val, bp, ep, xp, pp; |
| 2636 int scroll_amount = 0; | |
| 2637 int delta; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2638 int epto, old_tick; |
| 277 | 2639 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2640 int start_byte = marker_byte_position (w->start); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2641 |
| 277 | 2642 if (GPT - BEG < beg_unchanged) |
| 2643 beg_unchanged = GPT - BEG; | |
| 2644 if (Z - GPT < end_unchanged) | |
| 2645 end_unchanged = Z - GPT; | |
| 2646 | |
|
5739
0709eb474647
(try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
5676
diff
changeset
|
2647 if (beg_unchanged + BEG < start) |
| 277 | 2648 return 0; /* Give up if changes go above top of window */ |
| 2649 | |
| 2650 /* Find position before which nothing is changed. */ | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2651 bp = *compute_motion (start, 0, lmargin, 0, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2652 min (ZV, beg_unchanged + BEG), height, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2653 /* BUG FIX: See the comment of |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2654 Fpos_visible_in_window_p (window.c). */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2655 - (1 << (BITS_PER_SHORT - 1)), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2656 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2657 pos_tab_offset (w, start, start_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2658 w); |
| 277 | 2659 if (bp.vpos >= height) |
| 368 | 2660 { |
|
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
2661 if (PT < bp.bufpos) |
| 368 | 2662 { |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
2663 /* All changes are beyond the window end, and point is on the screen. |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
2664 We don't need to change the text at all. |
| 368 | 2665 But we need to update window_end_pos to account for |
| 2666 any change in buffer size. */ | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2667 bp = *compute_motion (start, 0, lmargin, 0, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2668 ZV, height, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2669 /* BUG FIX: See the comment of |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2670 Fpos_visible_in_window_p() (window.c). */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2671 - (1 << (BITS_PER_SHORT - 1)), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2672 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2673 pos_tab_offset (w, start, start_byte), w); |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2674 XSETFASTINT (w->window_end_vpos, height); |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2675 XSETFASTINT (w->window_end_pos, Z - bp.bufpos); |
|
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2676 goto findpoint; |
| 368 | 2677 } |
| 2678 return 0; | |
| 2679 } | |
| 277 | 2680 |
| 2681 vpos = bp.vpos; | |
| 2682 | |
| 769 | 2683 /* Find beginning of that frame line. Must display from there. */ |
| 11810 | 2684 bp = *vmotion (bp.bufpos, 0, w); |
| 277 | 2685 |
| 2686 pos = bp.bufpos; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2687 pos_byte = bp.bytepos; |
| 277 | 2688 val.hpos = lmargin; |
| 2689 if (pos < start) | |
| 2690 return -1; | |
| 2691 | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2692 did_motion = 0; |
| 277 | 2693 /* If about to start displaying at the beginning of a continuation line, |
| 769 | 2694 really start with previous frame line, in case it was not |
| 277 | 2695 continued when last redisplayed */ |
| 528 | 2696 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0) |
| 2697 || | |
| 2698 /* Likewise if we have to worry about selective display. */ | |
|
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2699 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0)) |
| 277 | 2700 { |
| 11810 | 2701 bp = *vmotion (bp.bufpos, -1, w); |
| 277 | 2702 --vpos; |
| 2703 pos = bp.bufpos; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2704 pos_byte = bp.bytepos; |
| 277 | 2705 } |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2706 val.tab_offset = bp.tab_offset; /* Update tab offset. */ |
| 277 | 2707 |
| 2708 if (bp.contin && bp.hpos != lmargin) | |
| 2709 { | |
| 2710 val.hpos = bp.prevhpos - width + lmargin; | |
|
24711
365644d49998
(try_window_id): Fix computation of tab_offset when
Andreas Schwab <schwab@suse.de>
parents:
24676
diff
changeset
|
2711 val.tab_offset = bp.tab_offset + width - bp.prevhpos; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2712 did_motion = 1; |
|
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
2713 DEC_BOTH (pos, pos_byte); |
| 277 | 2714 } |
| 2715 | |
| 2716 bp.vpos = vpos; | |
| 2717 | |
| 2718 /* Find first visible newline after which no more is changed. */ | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2719 opoint = PT, opoint_byte = PT_BYTE; |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
2720 TEMP_SET_PT (Z - max (end_unchanged, Z - ZV)); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2721 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
|
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2722 if (selective > 0) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2723 while (PT < ZV - 1 && indented_beyond_p (PT, PT_BYTE, selective)) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2724 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2725 tem = PT; |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
2726 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
| 277 | 2727 |
| 2728 /* Compute the cursor position after that newline. */ | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2729 ep = *compute_motion (pos, vpos, val.hpos, did_motion, tem, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2730 height, - (1 << (BITS_PER_SHORT - 1)), |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2731 width, hscroll, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2732 /* We have tab offset in VAL, use it. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2733 val.tab_offset, w); |
| 277 | 2734 |
| 769 | 2735 /* If changes reach past the text available on the frame, |
| 2736 just display rest of frame. */ | |
| 277 | 2737 if (ep.bufpos > Z - XFASTINT (w->window_end_pos)) |
| 2738 stop_vpos = height; | |
| 2739 else | |
| 2740 stop_vpos = ep.vpos; | |
| 2741 | |
| 2742 /* If no newline before ep, the line ep is on includes some changes | |
| 2743 that must be displayed. Make sure we don't stop before it. */ | |
| 2744 /* Also, if changes reach all the way until ep.bufpos, | |
| 2745 it is possible that something was deleted after the | |
| 2746 newline before it, so the following line must be redrawn. */ | |
| 2747 if (stop_vpos == ep.vpos | |
| 2748 && (ep.bufpos == BEGV | |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2749 || FETCH_BYTE (ep.bytepos - 1) != '\n' |
| 277 | 2750 || ep.bufpos == Z - end_unchanged)) |
| 2751 stop_vpos = ep.vpos + 1; | |
| 2752 | |
| 2753 cursor_vpos = -1; | |
| 2754 overlay_arrow_seen = 0; | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2755 zv_strings_seen = 0; |
| 277 | 2756 |
| 2757 /* If changes do not reach to bottom of window, | |
| 2758 figure out how much to scroll the rest of the window */ | |
| 2759 if (stop_vpos < height) | |
| 2760 { | |
| 2761 /* Now determine how far up or down the rest of the window has moved */ | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2762 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1, |
| 277 | 2763 Z - XFASTINT (w->window_end_pos), |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2764 /* Don't care for VPOS... */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2765 1 << (BITS_PER_SHORT - 1), |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2766 /* ... nor HPOS. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2767 1 << (BITS_PER_SHORT - 1), |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2768 width, hscroll, ep.tab_offset, w); |
| 277 | 2769 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos); |
| 2770 | |
| 769 | 2771 /* Is everything on frame below the changes whitespace? |
| 277 | 2772 If so, no scrolling is really necessary. */ |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2773 for (i = ep.bytepos; i < xp.bytepos; i++) |
| 277 | 2774 { |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2775 tem = FETCH_BYTE (i); |
| 277 | 2776 if (tem != ' ' && tem != '\n' && tem != '\t') |
| 2777 break; | |
| 2778 } | |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2779 if (i == xp.bytepos) |
| 277 | 2780 return -2; |
| 2781 | |
|
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2782 XSETFASTINT (w->window_end_vpos, |
|
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2783 XFASTINT (w->window_end_vpos) + scroll_amount); |
| 277 | 2784 |
| 769 | 2785 /* Before doing any scrolling, verify that point will be on frame. */ |
|
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2786 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height)) |
| 277 | 2787 { |
| 6705 | 2788 if (PT <= xp.bufpos) |
| 277 | 2789 { |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2790 pp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2791 PT, height, - (1 << (BITS_PER_SHORT - 1)), |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2792 width, hscroll, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2793 /* We have tab offset in EP, use it. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2794 ep.tab_offset, w); |
| 277 | 2795 } |
| 2796 else | |
| 2797 { | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2798 pp = *compute_motion (xp.bufpos, xp.vpos, xp.hpos, 1, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2799 PT, height, - (1 << (BITS_PER_SHORT - 1)), |
|
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2800 width, hscroll, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2801 /* We have tab offset in XP, use it. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2802 xp.tab_offset, w); |
| 277 | 2803 } |
| 6705 | 2804 if (pp.bufpos < PT || pp.vpos == height) |
| 277 | 2805 return 0; |
| 2806 cursor_vpos = pp.vpos + top; | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2807 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width); |
| 277 | 2808 } |
| 2809 | |
| 2810 if (stop_vpos - scroll_amount >= height | |
| 2811 || ep.bufpos == xp.bufpos) | |
| 2812 { | |
| 2813 if (scroll_amount < 0) | |
| 2814 stop_vpos -= scroll_amount; | |
| 2815 scroll_amount = 0; | |
| 2816 /* In this path, we have altered window_end_vpos | |
| 2817 and not left it negative. | |
| 2818 We must make sure that, in case display is preempted | |
| 769 | 2819 before the frame changes to reflect what we do here, |
| 277 | 2820 further updates will not come to try_window_id |
| 769 | 2821 and assume the frame and window_end_vpos match. */ |
| 277 | 2822 blank_end_of_window = 1; |
| 2823 } | |
| 2824 else if (!scroll_amount) | |
|
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2825 { |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2826 /* Even if we don't need to scroll, we must adjust the |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2827 charstarts of subsequent lines (that we won't redisplay) |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2828 according to the amount of text inserted or deleted. */ |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2829 int oldpos = FRAME_CURRENT_GLYPHS (f)->charstarts[ep.vpos + top][0]; |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2830 int adjust = ep.bufpos - oldpos; |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2831 adjust_window_charstarts (w, ep.vpos + top - 1, adjust); |
|
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2832 } |
| 277 | 2833 else if (bp.bufpos == Z - end_unchanged) |
| 2834 { | |
| 2835 /* If reprinting everything is nearly as fast as scrolling, | |
| 2836 don't bother scrolling. Can happen if lines are short. */ | |
| 769 | 2837 if (scroll_cost (f, bp.vpos + top - scroll_amount, |
| 277 | 2838 top + height - max (0, scroll_amount), |
| 2839 scroll_amount) | |
| 2840 > xp.bufpos - bp.bufpos - 20) | |
| 2841 /* Return "try normal display with same window-start." | |
| 2842 Too bad we can't prevent further scroll-thinking. */ | |
| 2843 return -2; | |
| 2844 /* If pure deletion, scroll up as many lines as possible. | |
| 2845 In common case of killing a line, this can save the | |
| 2846 following line from being overwritten by scrolling | |
| 2847 and therefore having to be redrawn. */ | |
| 769 | 2848 tem = scroll_frame_lines (f, bp.vpos + top - scroll_amount, |
|
6628
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2849 top + height - max (0, scroll_amount), |
|
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2850 scroll_amount, bp.bufpos); |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2851 if (!tem) |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2852 stop_vpos = height; |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2853 else |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2854 { |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2855 /* scroll_frame_lines did not properly adjust subsequent |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2856 lines' charstarts in the case where the text of the |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2857 screen line at bp.vpos has changed. |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2858 (This can happen in a deletion that ends in mid-line.) |
| 14036 | 2859 To adjust properly, we need to make things consistent |
| 2860 at the position ep. | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2861 So do a second adjust to make that happen. |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2862 Note that stop_vpos >= ep.vpos, so it is sufficient |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2863 to update the charstarts for lines at ep.vpos and below. */ |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2864 int oldstart |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2865 = FRAME_CURRENT_GLYPHS (f)->charstarts[ep.vpos + top][0]; |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2866 adjust_window_charstarts (w, ep.vpos + top - 1, |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2867 ep.bufpos - oldstart); |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2868 } |
| 277 | 2869 } |
| 2870 else if (scroll_amount) | |
| 2871 { | |
| 2872 /* If reprinting everything is nearly as fast as scrolling, | |
| 2873 don't bother scrolling. Can happen if lines are short. */ | |
| 2874 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an | |
| 2875 overestimate of cost of reprinting, since xp.bufpos | |
| 2876 would end up below the bottom of the window. */ | |
| 769 | 2877 if (scroll_cost (f, ep.vpos + top - scroll_amount, |
| 277 | 2878 top + height - max (0, scroll_amount), |
| 2879 scroll_amount) | |
| 2880 > xp.bufpos - ep.bufpos - 20) | |
| 2881 /* Return "try normal display with same window-start." | |
| 2882 Too bad we can't prevent further scroll-thinking. */ | |
| 2883 return -2; | |
| 769 | 2884 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount, |
| 277 | 2885 top + height - max (0, scroll_amount), |
|
6628
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2886 scroll_amount, ep.bufpos); |
| 277 | 2887 if (!tem) stop_vpos = height; |
| 2888 } | |
| 2889 } | |
| 2890 | |
| 2891 /* In any case, do not display past bottom of window */ | |
| 2892 if (stop_vpos >= height) | |
| 2893 { | |
| 2894 stop_vpos = height; | |
| 2895 scroll_amount = 0; | |
| 2896 } | |
| 2897 | |
| 2898 /* Handle case where pos is before w->start -- | |
| 2899 can happen if part of line had been clipped and is not clipped now */ | |
| 2900 if (vpos == 0 && pos < marker_position (w->start)) | |
| 2901 Fset_marker (w->start, make_number (pos), Qnil); | |
| 2902 | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2903 val.bytepos = pos_byte; |
|
24487
2612f75bdd2a
(try_window_id): Initizlie val.ovstring_chars_done to 0.
Kenichi Handa <handa@m17n.org>
parents:
24215
diff
changeset
|
2904 val.ovstring_chars_done = 0; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2905 |
| 277 | 2906 /* Redisplay the lines where the text was changed */ |
| 2907 last_text_vpos = vpos; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2908 /* The following code is omitted because we maintain tab offset in |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2909 val.tab_offset. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2910 #if 0 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2911 tab_offset = pos_tab_offset (w, pos, pos_byte); |
| 277 | 2912 /* If we are starting display in mid-character, correct tab_offset |
| 2913 to account for passing the line that that character really starts in. */ | |
| 2914 if (val.hpos < lmargin) | |
| 2915 tab_offset += width; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2916 #endif /* 0 */ |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2917 old_tick = MODIFF; |
| 277 | 2918 while (vpos < stop_vpos) |
| 2919 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2920 val = *display_text_line (w, pos, val.bytepos, top + vpos++, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2921 val.hpos, val.tab_offset, |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2922 val.ovstring_chars_done); |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2923 /* If display_text_line ran a hook and changed some text, |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2924 redisplay all the way to bottom of buffer |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2925 So that we show the changes. */ |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2926 if (old_tick != MODIFF) |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2927 stop_vpos = height; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2928 /* The following code is omitted because we maintain tab offset |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2929 in val.tab_offset. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2930 #if 0 |
| 277 | 2931 tab_offset += width; |
| 2932 if (val.vpos) tab_offset = 0; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2933 #endif |
| 277 | 2934 if (pos != val.bufpos) |
| 2935 last_text_vpos | |
| 2936 /* Next line, unless prev line ended in end of buffer with no cr */ | |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2937 = vpos - (val.vpos && FETCH_BYTE (val.bytepos - 1) != '\n'); |
| 277 | 2938 pos = val.bufpos; |
| 2939 } | |
| 2940 | |
| 2941 /* There are two cases: | |
| 2942 1) we have displayed down to the bottom of the window | |
| 2943 2) we have scrolled lines below stop_vpos by scroll_amount */ | |
| 2944 | |
| 2945 if (vpos == height) | |
| 2946 { | |
| 2947 /* If last line is continued in middle of character, | |
| 769 | 2948 include the split character in the text considered on the frame */ |
| 277 | 2949 if (val.hpos < lmargin) |
| 2950 val.bufpos++; | |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2951 XSETFASTINT (w->window_end_vpos, last_text_vpos); |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2952 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
| 277 | 2953 } |
| 2954 | |
| 2955 /* If scrolling made blank lines at window bottom, | |
| 2956 redisplay to fill those lines */ | |
| 2957 if (scroll_amount < 0) | |
| 2958 { | |
| 2959 /* Don't consider these lines for general-purpose scrolling. | |
| 2960 That will save time in the scrolling computation. */ | |
| 769 | 2961 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos; |
| 277 | 2962 vpos = xp.vpos; |
| 2963 pos = xp.bufpos; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2964 pos_byte = xp.bytepos; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2965 val.hpos = xp.hpos; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2966 val.tab_offset = xp.tab_offset; |
| 277 | 2967 if (pos == ZV) |
|
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2968 { /* Display from next line */ |
|
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2969 vpos = height + scroll_amount; |
|
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2970 val.hpos = lmargin; |
|
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2971 val.tab_offset = 0; |
|
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2972 } |
| 277 | 2973 else if (xp.contin && xp.hpos != lmargin) |
| 2974 { | |
| 2975 val.hpos = xp.prevhpos - width + lmargin; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2976 val.tab_offset = xp.tab_offset + bp.prevhpos - width; |
|
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
2977 DEC_BOTH (pos, pos_byte); |
| 277 | 2978 } |
| 2979 | |
| 2980 blank_end_of_window = 1; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2981 /* The following code is omitted because we maintain tab offset |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2982 in val.tab_offset. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2983 #if 0 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2984 tab_offset = pos_tab_offset (w, pos, pos_byte); |
| 277 | 2985 /* If we are starting display in mid-character, correct tab_offset |
| 2986 to account for passing the line that that character starts in. */ | |
| 2987 if (val.hpos < lmargin) | |
| 2988 tab_offset += width; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2989 #endif |
|
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2990 val.bytepos = pos_byte; |
| 277 | 2991 while (vpos < height) |
| 2992 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2993 val = *display_text_line (w, pos, val.bytepos, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2994 top + vpos++, val.hpos, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2995 val.tab_offset, val.ovstring_chars_done); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2996 /* The following code is omitted because we maintain tab |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2997 offset in val.tab_offset. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2998 #if 0 |
| 277 | 2999 tab_offset += width; |
| 3000 if (val.vpos) tab_offset = 0; | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3001 #endif /* 0 */ |
| 277 | 3002 pos = val.bufpos; |
| 3003 } | |
| 3004 | |
| 3005 /* Here is a case where display_text_line sets cursor_vpos wrong. | |
| 3006 Make it be fixed up, below. */ | |
| 3007 if (xp.bufpos == ZV | |
| 6705 | 3008 && xp.bufpos == PT) |
| 277 | 3009 cursor_vpos = -1; |
| 3010 } | |
| 3011 | |
| 769 | 3012 /* If bottom just moved off end of frame, change mode line percentage. */ |
| 277 | 3013 if (XFASTINT (w->window_end_pos) == 0 |
| 3014 && Z != val.bufpos) | |
| 3015 w->update_mode_line = Qt; | |
| 3016 | |
| 3017 /* Attempt to adjust end-of-text positions to new bottom line */ | |
| 3018 if (scroll_amount) | |
| 3019 { | |
| 3020 delta = height - xp.vpos; | |
| 3021 if (delta < 0 | |
| 3022 || (delta > 0 && xp.bufpos <= ZV) | |
| 3023 || (delta == 0 && xp.hpos)) | |
| 3024 { | |
| 11810 | 3025 val = *vmotion (Z - XFASTINT (w->window_end_pos), delta, w); |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3026 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
|
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
3027 XSETFASTINT (w->window_end_vpos, |
|
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
3028 XFASTINT (w->window_end_vpos) + val.vpos); |
| 277 | 3029 } |
| 3030 } | |
| 3031 | |
| 3032 w->window_end_valid = Qnil; | |
| 3033 | |
| 3034 /* If point was not in a line that was displayed, find it */ | |
| 3035 if (cursor_vpos < 0) | |
| 3036 { | |
|
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
3037 findpoint: |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3038 val = *compute_motion (start, 0, lmargin, 0, PT, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3039 /* Don't care for VPOS... */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3040 1 << (BITS_PER_SHORT - 1), |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3041 /* ... nor HPOS. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3042 1 << (BITS_PER_SHORT - 1), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3043 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3044 pos_tab_offset (w, start, start_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3045 w); |
| 769 | 3046 /* Admit failure if point is off frame now */ |
| 277 | 3047 if (val.vpos >= height) |
| 3048 { | |
| 3049 for (vpos = 0; vpos < height; vpos++) | |
| 769 | 3050 cancel_line (vpos + top, f); |
| 277 | 3051 return 0; |
| 3052 } | |
| 3053 cursor_vpos = val.vpos + top; | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3054 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width); |
| 277 | 3055 } |
| 3056 | |
| 11810 | 3057 FRAME_CURSOR_X (f) = cursor_hpos; |
| 769 | 3058 FRAME_CURSOR_Y (f) = cursor_vpos; |
| 277 | 3059 |
| 3060 if (debug_end_pos) | |
| 3061 { | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3062 val = *compute_motion (start, 0, lmargin, 0, ZV, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
3063 height, - (1 << (BITS_PER_SHORT - 1)), |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3064 width, hscroll, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3065 pos_tab_offset (w, start, start_byte), |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3066 w); |
| 277 | 3067 if (val.vpos != XFASTINT (w->window_end_vpos)) |
| 3068 abort (); | |
| 3069 if (XFASTINT (w->window_end_pos) | |
| 3070 != Z - val.bufpos) | |
| 3071 abort (); | |
| 3072 } | |
| 3073 | |
| 3074 return 1; | |
| 3075 } | |
| 3076 | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3077 /* Copy LEN glyphs starting address FROM to the rope TO. |
| 301 | 3078 But don't actually copy the parts that would come in before S. |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3079 Value is TO, advanced past the copied data. |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3080 F is the frame we are displaying in. */ |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3081 |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3082 static GLYPH * |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3083 copy_part_of_rope (f, to, s, from, len, face) |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3084 FRAME_PTR f; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3085 register GLYPH *to; /* Copy to here. */ |
|
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
3086 register GLYPH *s; /* Starting point. */ |
|
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3087 Lisp_Object *from; /* Data to copy. */ |
|
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
3088 int len; |
|
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3089 int face; /* Face to apply to glyphs which don't specify one. */ |
|
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
3090 { |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3091 int n = len; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3092 register Lisp_Object *fp = from; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3093 /* These cache the results of the last call to compute_glyph_face. */ |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3094 int last_code = -1; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3095 int last_merged = 0; |
| 277 | 3096 |
| 9572 | 3097 #ifdef HAVE_FACES |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3098 if (! FRAME_TERMCAP_P (f)) |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3099 while (n--) |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3100 { |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3101 GLYPH glyph = (INTEGERP (*fp) ? XFASTINT (*fp) : 0); |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3102 int facecode; |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3103 unsigned int c = FAST_GLYPH_CHAR (glyph); |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3104 |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3105 if (c > MAX_CHAR) |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3106 /* For an invalid character code, use space. */ |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3107 c = ' '; |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3108 |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3109 if (FAST_GLYPH_FACE (glyph) == 0) |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3110 /* If GLYPH has no face code, use FACE. */ |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3111 facecode = face; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3112 else if (FAST_GLYPH_FACE (glyph) == last_code) |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3113 /* If it's same as previous glyph, use same result. */ |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3114 facecode = last_merged; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3115 else |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3116 { |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3117 /* Merge this glyph's face and remember the result. */ |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3118 last_code = FAST_GLYPH_FACE (glyph); |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3119 last_merged = facecode = compute_glyph_face (f, last_code, face); |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3120 } |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3121 |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3122 if (to >= s) |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3123 *to = FAST_MAKE_GLYPH (c, facecode); |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3124 ++to; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3125 ++fp; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3126 } |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3127 else |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3128 #endif |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3129 while (n--) |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3130 { |
|
6741
840862375e93
(copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents:
6740
diff
changeset
|
3131 if (to >= s) *to = (INTEGERP (*fp) ? XFASTINT (*fp) : 0); |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3132 ++to; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3133 ++fp; |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3134 } |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3135 return to; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3136 } |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3137 |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3138 /* Correct a glyph by replacing its specified user-level face code |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3139 with a displayable computed face code. */ |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3140 |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3141 static GLYPH |
|
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3142 fix_glyph (f, glyph, cface) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3143 FRAME_PTR f; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3144 GLYPH glyph; |
|
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3145 int cface; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3146 { |
| 9572 | 3147 #ifdef HAVE_FACES |
|
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3148 if (! FRAME_TERMCAP_P (f)) |
|
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3149 { |
|
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3150 if (FAST_GLYPH_FACE (glyph) != 0) |
|
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3151 cface = compute_glyph_face (f, FAST_GLYPH_FACE (glyph), cface); |
|
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3152 glyph = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), cface); |
|
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
3153 } |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3154 #endif |
|
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3155 return glyph; |
| 277 | 3156 } |
| 3157 | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3158 /* Return the column of position POS / POS_BYTE in window W's buffer. |
|
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3159 When used on the character at the beginning of a line, |
|
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3160 starting at column 0, this says how much to subtract from |
|
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3161 the column position of any character in the line |
|
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3162 to get its horizontal position on the screen. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3163 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3164 static int |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3165 pos_tab_offset (w, pos, pos_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3166 struct window *w; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3167 register int pos, pos_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3168 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3169 int opoint = PT; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3170 int opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3171 int col; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3172 int width = window_internal_width (w) - 1; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3173 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3174 if (pos == BEGV) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3175 return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3176 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3177 if (FETCH_BYTE (pos_byte - 1) == '\n') |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3178 return 0; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3179 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3180 TEMP_SET_PT_BOTH (pos, pos_byte); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3181 col = current_column (); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3182 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3183 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3184 return col; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3185 } |
|
22148
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
3186 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3187 /* Display one line of window W, starting at char position START in W's buffer. |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3188 START_BYTE is the corresponding byte position. |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3189 |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3190 Display starting at horizontal position HPOS, expressed relative to |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3191 W's left edge. In situations where the text at START shouldn't |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3192 start at the left margin (i.e. when the window is hscrolled, or |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3193 we're continuing a line which left off in the midst of a |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3194 multi-column character), HPOS should be negative; we throw away |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3195 characters up 'til hpos = 0. So, HPOS must take hscrolling into |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3196 account. |
| 277 | 3197 |
| 3198 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations. | |
| 3199 | |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3200 OVSTR_DONE is the number of chars of overlay before/after strings |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3201 at this position which have already been processed. |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3202 |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3203 Display on position VPOS on the frame. It is origin 0, relative to |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3204 the top of the frame, not W. |
| 277 | 3205 |
| 3206 Returns a STRUCT POSITION giving character to start next line with | |
| 3207 and where to display it, including a zero or negative hpos. | |
| 3208 The vpos field is not really a vpos; it is 1 unless the line is continued */ | |
| 3209 | |
| 3210 struct position val_display_text_line; | |
| 3211 | |
| 3212 static struct position * | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3213 display_text_line (w, start, start_byte, vpos, hpos, taboffset, ovstr_done) |
| 277 | 3214 struct window *w; |
| 3215 int start; | |
| 3216 int vpos; | |
| 3217 int hpos; | |
| 3218 int taboffset; | |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3219 int ovstr_done; |
| 277 | 3220 { |
| 3221 register int pos = start; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3222 int pos_byte = start_byte; |
| 277 | 3223 register int c; |
| 3224 register GLYPH *p1; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3225 int pause, limit_byte; |
| 277 | 3226 register unsigned char *p; |
| 3227 GLYPH *endp; | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3228 register GLYPH *leftmargin; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3229 register GLYPH *p1prev; |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3230 register GLYPH *p1start; |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3231 GLYPH *p1_wide_column_end = (GLYPH *) 0; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3232 int prevpos, prevpos_byte; |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3233 int *charstart; |
| 769 | 3234 FRAME_PTR f = XFRAME (w->frame); |
| 277 | 3235 int tab_width = XINT (current_buffer->tab_width); |
| 485 | 3236 int ctl_arrow = !NILP (current_buffer->ctl_arrow); |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3237 int width = window_internal_width (w) - 1; |
| 277 | 3238 struct position val; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3239 int lastpos, lastpos_byte; |
| 277 | 3240 int invis; |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3241 int last_invis_skip = 0; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3242 Lisp_Object last_invis_prop; |
| 277 | 3243 int hscroll = XINT (w->hscroll); |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3244 int truncate = (hscroll |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3245 || (truncate_partial_width_windows |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3246 && !WINDOW_FULL_WIDTH_P (w)) |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3247 || !NILP (current_buffer->truncate_lines)); |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3248 |
|
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3249 /* 1 if this buffer has a region to highlight. */ |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3250 int highlight_region |
|
16069
8fe5e69de92a
(redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3251 = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active) |
|
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3252 && XMARKER (current_buffer->mark)->buffer != 0); |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3253 int region_beg, region_end; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3254 |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3255 int selective = (INTEGERP (current_buffer->selective_display) |
|
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3256 ? XINT (current_buffer->selective_display) |
|
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3257 : !NILP (current_buffer->selective_display) ? -1 : 0); |
| 769 | 3258 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
|
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
3259 register struct Lisp_Char_Table *dp = window_display_table (w); |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3260 |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3261 Lisp_Object default_invis_vector[3]; |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3262 /* Number of characters of ellipsis to display after an invisible line |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3263 if it calls for an ellipsis. |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3264 Note that this value can be nonzero regardless of whether |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3265 selective display is enabled--you must check that separately. */ |
| 277 | 3266 int selective_rlen |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3267 = (dp && VECTORP (DISP_INVIS_VECTOR (dp)) |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3268 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3269 : !NILP (current_buffer->selective_display_ellipses) ? 3 : 0); |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3270 /* This is the sequence of Lisp objects to display |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3271 when there are invisible lines. */ |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3272 Lisp_Object *invis_vector_contents |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3273 = (dp && VECTORP (DISP_INVIS_VECTOR (dp)) |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3274 ? XVECTOR (DISP_INVIS_VECTOR (dp))->contents |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3275 : default_invis_vector); |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3276 |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3277 GLYPH truncator = (dp == 0 || !INTEGERP (DISP_TRUNC_GLYPH (dp)) |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3278 || !GLYPH_CHAR_VALID_P (XINT (DISP_TRUNC_GLYPH (dp))) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3279 ? '$' : XINT (DISP_TRUNC_GLYPH (dp))); |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3280 GLYPH continuer = (dp == 0 || !INTEGERP (DISP_CONTINUE_GLYPH (dp)) |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3281 || !GLYPH_CHAR_VALID_P (XINT (DISP_CONTINUE_GLYPH (dp))) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3282 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp))); |
| 277 | 3283 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3284 /* If 1, we must handle multibyte characters. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3285 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3286 /* Length of multibyte form of each character. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3287 int len; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3288 /* Glyphs generated should be set this bit mask if text must be |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3289 displayed from right to left. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3290 GLYPH rev_dir_bit = (NILP (current_buffer->direction_reversed) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3291 ? 0 : GLYPH_MASK_REV_DIR); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3292 |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3293 /* The next buffer location at which the face should change, due |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3294 to overlays or text property changes. */ |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3295 int next_face_change; |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3296 |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3297 /* The next location where the `invisible' property changes, or an |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3298 overlay starts or ends. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3299 int next_boundary; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3300 |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3301 /* The face we're currently using. */ |
|
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3302 int current_face = 0; |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3303 int i; |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3304 |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3305 XSETFASTINT (default_invis_vector[2], '.'); |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3306 default_invis_vector[0] = default_invis_vector[1] = default_invis_vector[2]; |
|
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3307 |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3308 get_display_line (f, vpos, WINDOW_LEFT_MARGIN (w)); |
|
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
3309 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 277 | 3310 |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3311 /* Show where to highlight the region. */ |
|
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3312 if (highlight_region |
|
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
3313 /* Maybe highlight only in selected window. */ |
|
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
3314 && (highlight_nonselected_windows |
|
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3315 || w == XWINDOW (selected_window) |
|
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3316 || (MINI_WINDOW_P (XWINDOW (selected_window)) |
|
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3317 && w == XWINDOW (Vminibuf_scroll_window)))) |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3318 { |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3319 region_beg = marker_position (current_buffer->mark); |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3320 if (PT < region_beg) |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3321 { |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3322 region_end = region_beg; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3323 region_beg = PT; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3324 } |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3325 else |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3326 region_end = PT; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3327 w->region_showing = Qt; |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3328 } |
|
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3329 else |
|
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3330 { |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3331 region_beg = region_end = -1; |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3332 w->region_showing = Qnil; |
|
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3333 } |
|
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3334 |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3335 if (MINI_WINDOW_P (w) |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3336 && start == BEG |
| 277 | 3337 && vpos == XFASTINT (w->top)) |
| 3338 { | |
|
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
3339 if (! NILP (minibuf_prompt)) |
|
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3340 { |
|
18994
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
3341 int old_width = minibuf_prompt_width; |
|
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
3342 |
|
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3343 minibuf_prompt_width |
|
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
3344 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data, |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
3345 STRING_BYTES (XSTRING (minibuf_prompt)), |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3346 hpos + WINDOW_LEFT_MARGIN (w), |
|
9756
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3347 /* Display a space if we truncate. */ |
|
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3348 ' ', |
|
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3349 1, -1, |
|
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3350 /* Truncate the prompt a little before the |
|
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3351 margin, so user input can at least start |
|
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3352 on the first line. */ |
|
17362
87db7dfa4a96
(display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17317
diff
changeset
|
3353 (XFASTINT (w->width) > 10 |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3354 ? XFASTINT (w->width) - 4 : -1), |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
3355 STRING_MULTIBYTE (minibuf_prompt)) |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3356 - hpos - WINDOW_LEFT_MARGIN (w)); |
|
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3357 hpos += minibuf_prompt_width; |
|
18994
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
3358 taboffset -= minibuf_prompt_width - old_width; |
|
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3359 } |
|
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3360 else |
|
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3361 minibuf_prompt_width = 0; |
| 277 | 3362 } |
| 3363 | |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3364 /* If we're hscrolled at all, use compute_motion to skip over any |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3365 text off the left edge of the window. compute_motion may know |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3366 tricks to do this faster than we can. */ |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3367 if (hpos < 0) |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3368 { |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3369 struct position *left_edge |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3370 = compute_motion (pos, vpos, hpos, 0, |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3371 ZV, vpos, 0, |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3372 width, hscroll, taboffset, w); |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3373 |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3374 /* Retrieve the buffer position and column provided by |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3375 compute_motion. We can't assume that the column will be |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3376 zero, because you may have multi-column characters crossing |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3377 the left margin. |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3378 |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3379 compute_motion may have moved us past the screen position we |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3380 requested, if we hit a multi-column character, or the end of |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3381 the line. If so, back up. */ |
|
23784
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3382 if ((left_edge->vpos > vpos |
|
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3383 || left_edge->hpos > 0) |
|
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3384 && left_edge->bufpos > pos) |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3385 { |
|
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
3386 pos = left_edge->bufpos; |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3387 pos_byte = left_edge->bytepos; |
|
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
3388 DEC_BOTH (pos, pos_byte); |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3389 hpos = left_edge->prevhpos; |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3390 } |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3391 else |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3392 { |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3393 pos = left_edge->bufpos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3394 pos_byte = left_edge->bytepos; |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3395 hpos = left_edge->hpos; |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3396 } |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3397 } |
|
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3398 |
|
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3399 hpos += WINDOW_LEFT_MARGIN (w); |
|
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3400 |
|
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3401 desired_glyphs->bufp[vpos] = start; |
| 277 | 3402 p1 = desired_glyphs->glyphs[vpos] + hpos; |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3403 p1start = p1; |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3404 charstart = desired_glyphs->charstarts[vpos] + hpos; |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3405 /* In case we don't ever write anything into it... */ |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3406 desired_glyphs->charstarts[vpos][WINDOW_LEFT_MARGIN (w)] = -1; |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3407 leftmargin = desired_glyphs->glyphs[vpos] + WINDOW_LEFT_MARGIN (w); |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3408 endp = leftmargin + width; |
| 277 | 3409 |
|
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3410 /* Arrange the overlays nicely for our purposes. Usually, we call |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3411 display_text_line on only one line at a time, in which case this |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3412 can't really hurt too much, or we call it on lines which appear |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3413 one after another in the buffer, in which case all calls to |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3414 recenter_overlay_lists but the first will be pretty cheap. */ |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3415 recenter_overlay_lists (current_buffer, pos); |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3416 |
| 277 | 3417 /* Loop generating characters. |
| 3418 Stop at end of buffer, before newline, | |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3419 if reach or pass continuation column, |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3420 or at face change. */ |
| 277 | 3421 pause = pos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3422 limit_byte = pos_byte; |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3423 next_face_change = pos; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3424 next_boundary = pos; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3425 p1prev = p1; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3426 prevpos = pos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3427 prevpos_byte = pos_byte; |
|
18829
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3428 |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3429 /* If the window is hscrolled and point is in the invisible part of the |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3430 current line beyond the left margin we can record the cursor location |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3431 right away. */ |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3432 if (hscroll && start <= PT && PT < pos && cursor_vpos < 0) |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3433 { |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3434 cursor_vpos = vpos; |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3435 cursor_hpos = p1 - leftmargin; |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3436 } |
|
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3437 |
|
18730
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
3438 while (p1 < endp) |
| 277 | 3439 { |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3440 if (pos >= pause) |
| 277 | 3441 { |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3442 int e_t_h; |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3443 |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3444 while (pos == next_boundary) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3445 { |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3446 Lisp_Object position, limit, prop, ww; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3447 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3448 /* Display the overlay strings here, unless we're at ZV |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3449 and have already displayed the appropriate strings |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3450 on an earlier line. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3451 if (pos < ZV || !zv_strings_seen++) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3452 { |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3453 int ovlen; |
|
16245
d960549d163c
(display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents:
16197
diff
changeset
|
3454 unsigned char *ovstr; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3455 ovlen = overlay_strings (pos, w, &ovstr); |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3456 |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3457 if (ovlen > 0) |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3458 { |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3459 /* Skip the ones we did in a previous line. */ |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3460 ovstr += ovstr_done; |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3461 ovlen -= ovstr_done; |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3462 |
|
24557
7bc142e9e59f
(redisplay_window): When we call compute_motion with
Kenichi Handa <handa@m17n.org>
parents:
24511
diff
changeset
|
3463 while (ovlen > 0 && p1 < endp) |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3464 { |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3465 int charset, cols; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3466 GLYPH g; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3467 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3468 if (multibyte) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3469 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3470 c = STRING_CHAR_AND_LENGTH (ovstr, ovlen, len); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3471 ovstr += len, ovlen -= len, ovstr_done += len; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3472 charset = CHAR_CHARSET (c); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3473 cols = (charset == CHARSET_COMPOSITION |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3474 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3475 : CHARSET_WIDTH (charset)); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3476 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3477 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3478 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3479 c = *ovstr++, ovlen--, ovstr_done++; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3480 cols = 1; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3481 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3482 g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3483 while (cols-- > 0) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3484 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3485 if (p1 >= leftmargin && p1 < endp) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3486 *p1 = g, g |= GLYPH_MASK_PADDING; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3487 p1++; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3488 } |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3489 } |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3490 /* If we did all the overlay strings |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3491 and we have room for text, clear ovstr_done |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3492 just for neatness' sake. */ |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3493 if (ovlen == 0 && p1 < endp) |
|
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3494 ovstr_done = 0; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3495 } |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3496 } |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3497 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3498 /* Did we reach point? Record the cursor location. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3499 if (pos == PT && cursor_vpos < 0) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3500 { |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3501 cursor_vpos = vpos; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3502 cursor_hpos = p1 - leftmargin; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3503 } |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3504 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3505 if (pos >= ZV) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3506 break; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3507 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3508 XSETFASTINT (position, pos); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3509 limit = Fnext_overlay_change (position); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3510 #ifdef USE_TEXT_PROPERTIES |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3511 /* This is just an estimate to give reasonable |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3512 performance; nothing should go wrong if it is too small. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3513 if (XFASTINT (limit) > pos + 50) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3514 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3515 int limitpos = pos + 50; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3516 XSETFASTINT (limit, limitpos); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3517 } |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3518 limit = Fnext_single_property_change (position, Qinvisible, |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3519 Fcurrent_buffer (), limit); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3520 #endif |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3521 next_boundary = XFASTINT (limit); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3522 /* if the `invisible' property is set, we can skip to |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3523 the next property change. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3524 XSETWINDOW (ww, w); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3525 prop = Fget_char_property (position, Qinvisible, ww); |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3526 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3527 { |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3528 if (pos < PT && next_boundary >= PT) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3529 { |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3530 cursor_vpos = vpos; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3531 cursor_hpos = p1 - leftmargin; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3532 } |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3533 pos = next_boundary; |
|
20666
7e740edb4d52
(display_text_line): Set pos_byte with pos
Karl Heuer <kwzh@gnu.org>
parents:
20628
diff
changeset
|
3534 pos_byte = CHAR_TO_BYTE (pos); |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3535 last_invis_skip = pos; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3536 last_invis_prop = prop; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3537 } |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3538 } |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3539 |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3540 /* Did we reach point? Record the cursor location. */ |
| 6705 | 3541 if (pos == PT && cursor_vpos < 0) |
| 277 | 3542 { |
| 3543 cursor_vpos = vpos; | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3544 cursor_hpos = p1 - leftmargin; |
| 277 | 3545 } |
| 3546 | |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3547 /* Did we hit the end of the visible region of the buffer? |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3548 Stop here. */ |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3549 if (pos >= ZV) |
|
12293
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3550 { |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3551 /* Update charstarts for the end of this line. */ |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3552 /* Do nothing if off the left edge or at the right edge. */ |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3553 if (p1 >= leftmargin && p1 + 1 != endp) |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3554 { |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3555 int *p2x = &charstart[(p1 < leftmargin |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3556 ? leftmargin : p1) |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3557 - p1start]; |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3558 *p2x++ = pos; |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3559 } |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3560 break; |
|
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3561 } |
|
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
3562 |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3563 /* Figure out where (if at all) the |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3564 redisplay_end_trigger-hook should run. */ |
|
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3565 if (MARKERP (w->redisplay_end_trigger) |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3566 && XMARKER (w->redisplay_end_trigger)->buffer != 0) |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3567 e_t_h = marker_position (w->redisplay_end_trigger); |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3568 else if (INTEGERP (w->redisplay_end_trigger)) |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3569 e_t_h = XINT (w->redisplay_end_trigger); |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3570 else |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3571 e_t_h = ZV; |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3572 |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3573 /* If we've gone past the place to run a hook, |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3574 run the hook. */ |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3575 if (pos >= e_t_h && e_t_h != ZV) |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3576 { |
|
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3577 Lisp_Object args[3]; |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3578 |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3579 args[0] = Qredisplay_end_trigger_functions; |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3580 XSETWINDOW (args[1], w); |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3581 XSETINT (args[2], e_t_h); |
|
14133
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3582 |
|
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3583 /* Since we are *trying* to run these functions, |
|
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3584 don't try to run them again, even if they get an error. */ |
|
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3585 w->redisplay_end_trigger = Qnil; |
|
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3586 Frun_hook_with_args (3, args); |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3587 |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3588 e_t_h = ZV; |
|
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3589 /* Notice if it changed the face of this character. */ |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3590 next_face_change = pos; |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3591 } |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3592 |
|
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3593 #ifdef HAVE_FACES |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3594 /* Did we hit a face change? Figure out what face we should |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3595 use now. We also hit this the first time through the |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3596 loop, to see what face we should start with. */ |
|
15381
91662157e604
(redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents:
15245
diff
changeset
|
3597 if (pos >= next_face_change |
|
91662157e604
(redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents:
15245
diff
changeset
|
3598 && (FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f))) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3599 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3600 int limit = pos + 50; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3601 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3602 current_face = compute_char_face (f, w, pos, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3603 region_beg, region_end, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3604 &next_face_change, limit, 0); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3605 } |
|
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3606 #endif |
|
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3607 |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3608 /* Compute the next place we need to stop |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3609 and do something special; set PAUSE. */ |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3610 |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3611 pause = ZV; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3612 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3613 if (pos < next_boundary && next_boundary < pause) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3614 pause = next_boundary; |
|
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3615 if (pos < next_face_change && next_face_change < pause) |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3616 pause = next_face_change; |
|
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3617 |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3618 if (e_t_h < pause) |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3619 pause = e_t_h; |
|
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3620 |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3621 /* Wouldn't you hate to read the next line to someone over |
|
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3622 the phone? */ |
| 6705 | 3623 if (pos < PT && PT < pause) |
| 3624 pause = PT; | |
| 277 | 3625 if (pos < GPT && GPT < pause) |
| 3626 pause = GPT; | |
| 3627 | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3628 /* LIMIT_BYTE is not the same place in the buffer as PAUSE. |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3629 It is a limit on valid characters. |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3630 We use it to bound STRING_CHAR_AND_LENGTH. */ |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3631 limit_byte = ZV_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3632 if (pos < GPT && GPT_BYTE < limit_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3633 limit_byte = GPT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3634 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3635 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3636 int temp = CHAR_TO_BYTE (pos); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3637 p = BYTE_POS_ADDR (temp); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3638 } |
| 277 | 3639 } |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3640 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3641 if (p1 >= endp) |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3642 break; |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3643 |
|
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3644 p1prev = p1; |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3645 p1_wide_column_end = (GLYPH *) 0; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3646 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3647 if (multibyte) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3648 c = STRING_CHAR_AND_LENGTH (p, limit_byte - pos_byte, len), p += len; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3649 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3650 c = *p++, len = 1; |
|
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3651 /* Let a display table override all standard display methods. */ |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3652 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3653 { |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3654 p1 = copy_part_of_rope (f, p1, leftmargin, |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3655 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3656 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3657 current_face, rev_dir_bit); |
|
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3658 } |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3659 else if (c >= 040 && c < 0177) |
| 277 | 3660 { |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3661 if (p1 >= leftmargin) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3662 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
| 277 | 3663 p1++; |
| 3664 } | |
| 3665 else if (c == '\n') | |
| 3666 { | |
|
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3667 #if 0 |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3668 /* Same as p1prev, but after the invis_vector_contents text |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3669 (if we have that on this line). */ |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3670 GLYPH *p1prev_modified; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3671 #endif |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3672 |
| 277 | 3673 invis = 0; |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3674 if (last_invis_skip == pos |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3675 && TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (last_invis_prop)) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3676 invis = 1; |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3677 while (pos + 1 < ZV |
| 277 | 3678 && selective > 0 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3679 && indented_beyond_p (pos + 1, pos_byte + 1, selective)) |
| 277 | 3680 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3681 int opoint = PT, opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3682 |
| 277 | 3683 invis = 1; |
|
20896
ec8cd27243b6
(display_text_line): Use INC_BOTH for unibyte buffers too.
Richard M. Stallman <rms@gnu.org>
parents:
20786
diff
changeset
|
3684 INC_BOTH (pos, pos_byte); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3685 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1); |
|
21478
54680b998295
(display_text_line): When handling selective > 0,
Karl Heuer <kwzh@gnu.org>
parents:
21443
diff
changeset
|
3686 pos = PT, pos_byte = PT_BYTE; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3687 if (FETCH_BYTE (pos_byte - 1) == '\n') |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3688 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3689 pos--; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3690 pos_byte--; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3691 } |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3692 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
| 277 | 3693 } |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3694 if (invis && selective_rlen > 0 && p1 >= leftmargin) |
| 277 | 3695 { |
|
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3696 #if 0 |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3697 GLYPH *cs, *csend; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3698 |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3699 cs = charstart + (p1 - p1start); |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3700 #endif |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3701 |
| 277 | 3702 p1 += selective_rlen; |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3703 if (p1 - leftmargin > width) |
| 277 | 3704 p1 = endp; |
|
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3705 |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3706 #if 0 /* This needs more work; charstarts needs to record |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3707 both whether a position ho;ds an ellipsis character |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3708 and what buffer position it corresponds to. */ |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3709 csend = charstart + (p1 - p1start); |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3710 while (cs != csend) |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3711 *cs++ = -2; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3712 /* The idea is to use p1prev_modified instead of p1prev |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3713 in the loop below over p2x. */ |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3714 p1prev_modified = p1; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3715 #endif |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3716 |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3717 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3718 (p1 - p1prev), current_face, rev_dir_bit); |
| 277 | 3719 } |
|
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3720 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3721 /* Update charstarts for the newline that ended this line. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3722 /* Do nothing here for a char that's entirely off the left edge |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3723 or if it starts at the right edge. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3724 if (p1 >= leftmargin && p1prev != endp) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3725 { |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3726 /* Store the newline's position into charstarts |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3727 for the column where the newline starts. |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3728 Store -1 for the rest of the glyphs it occupies. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3729 int *p2x = &charstart[(p1prev < leftmargin |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3730 ? leftmargin : p1prev) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3731 - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3732 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3733 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3734 *p2x++ = pos; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3735 while (p2x < p2) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3736 *p2x++ = -1; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3737 } |
|
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3738 #ifdef HAVE_FACES |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3739 /* Draw the face of the newline character as extending all the |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3740 way to the end of the frame line. */ |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3741 if (current_face) |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3742 { |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3743 if (p1 < leftmargin) |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3744 p1 = leftmargin; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3745 while (p1 < endp) |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3746 *p1++ = FAST_MAKE_GLYPH (' ', current_face) | rev_dir_bit; |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3747 } |
|
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3748 #endif |
|
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3749 |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3750 break; |
| 277 | 3751 } |
| 3752 else if (c == '\t') | |
| 3753 { | |
| 3754 do | |
| 3755 { | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3756 if (p1 >= leftmargin && p1 < endp) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3757 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit; |
| 277 | 3758 p1++; |
| 3759 } | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3760 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0)) |
| 277 | 3761 % tab_width); |
| 3762 } | |
| 368 | 3763 else if (c == Ctl ('M') && selective == -1) |
| 277 | 3764 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3765 int opoint = PT, opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3766 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3767 pos = PT, pos_byte = PT_BYTE; |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3768 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3769 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3770 if (FETCH_BYTE (pos_byte - 1) == '\n') |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3771 pos--, pos_byte--; |
| 277 | 3772 if (selective_rlen > 0) |
| 3773 { | |
| 3774 p1 += selective_rlen; | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3775 if (p1 - leftmargin > width) |
| 277 | 3776 p1 = endp; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3777 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3778 (p1 - p1prev), current_face, rev_dir_bit); |
| 277 | 3779 } |
| 9572 | 3780 #ifdef HAVE_FACES |
|
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3781 /* Draw the face of the newline character as extending all the |
|
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3782 way to the end of the frame line. */ |
|
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3783 if (current_face) |
|
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3784 { |
|
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3785 if (p1 < leftmargin) |
|
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3786 p1 = leftmargin; |
|
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3787 while (p1 < endp) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3788 *p1++ = FAST_MAKE_GLYPH (' ', current_face) | rev_dir_bit; |
|
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3789 } |
|
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3790 #endif |
|
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3791 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3792 /* Update charstarts for the ^M that ended this line. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3793 /* Do nothing here for a char that's entirely off the left edge |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3794 or if it starts at the right edge. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3795 if (p1 >= leftmargin && p1prev != endp) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3796 { |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3797 /* Store the newline's position into charstarts |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3798 for the column where the newline starts. |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3799 Store -1 for the rest of the glyphs it occupies. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3800 int *p2x = &charstart[(p1prev < leftmargin |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3801 ? leftmargin : p1prev) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3802 - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3803 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3804 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3805 *p2x++ = pos; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3806 while (p2x < p2) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3807 *p2x++ = -1; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3808 } |
|
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3809 break; |
| 277 | 3810 } |
| 3811 else if (c < 0200 && ctl_arrow) | |
| 3812 { | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3813 if (p1 >= leftmargin) |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3814 *p1 = (fix_glyph |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3815 (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3816 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (dp))) |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3817 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3818 current_face) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3819 | rev_dir_bit); |
| 277 | 3820 p1++; |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3821 if (p1 >= leftmargin && p1 < endp) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3822 *p1 = MAKE_GLYPH (f, c ^ 0100, current_face) | rev_dir_bit; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3823 p1++; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3824 } |
| 277 | 3825 else |
| 3826 { | |
|
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3827 /* C is a multibyte character or a character to be displayed |
| 22529 | 3828 by octal form. */ |
|
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3829 int remaining_bytes = len; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3830 |
|
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3831 if (unibyte_display_via_language_environment |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3832 && SINGLE_BYTE_CHAR_P (c) |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3833 && (c >= 0240 |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3834 || (c >= 0200 && !NILP (Vnonascii_translation_table)))) |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3835 c = unibyte_char_to_multibyte (c); |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
3836 |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
3837 if (c >= 0400 && CHAR_VALID_P (c, 0)) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3838 { |
|
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3839 /* C is a multibyte character. */ |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3840 int charset = CHAR_CHARSET (c); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3841 int columns = (charset == CHARSET_COMPOSITION |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3842 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3843 : CHARSET_WIDTH (charset)); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3844 GLYPH g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3845 |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3846 while (columns--) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3847 { |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3848 if (p1 >= leftmargin && p1 < endp) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3849 *p1 = g, g |= GLYPH_MASK_PADDING; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3850 p1++; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3851 } |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3852 p1_wide_column_end = p1; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3853 remaining_bytes -= CHARSET_BYTES (charset); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3854 } |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3855 |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3856 while (remaining_bytes > 0) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3857 { |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3858 c = *(p - remaining_bytes--); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3859 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3860 if (p1 >= leftmargin && p1 < endp) |
|
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3861 *p1 = (fix_glyph |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3862 (f, |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3863 (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3864 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3865 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3866 current_face) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3867 | rev_dir_bit); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3868 p1++; |
|
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3869 if (p1 >= leftmargin && p1 < endp) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3870 *p1 = (MAKE_GLYPH (f, (c >> 6) + '0', current_face) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3871 | rev_dir_bit); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3872 p1++; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3873 if (p1 >= leftmargin && p1 < endp) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3874 *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3875 | rev_dir_bit); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3876 p1++; |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3877 if (p1 >= leftmargin && p1 < endp) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3878 *p1 = (MAKE_GLYPH (f, (7 & c) + '0', current_face) |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3879 | rev_dir_bit); |
|
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3880 p1++; |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3881 } |
| 277 | 3882 } |
|
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3883 |
|
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3884 prevpos = pos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3885 prevpos_byte = pos_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3886 pos++; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3887 pos_byte += len; |
|
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3888 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3889 /* Update charstarts for the character just output. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3890 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3891 /* Do nothing here for a char that's entirely off the left edge. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3892 if (p1 >= leftmargin) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3893 { |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3894 /* Store the char's position into charstarts |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3895 for the first glyph occupied by this char. |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3896 Store -1 for the rest of the glyphs it occupies. */ |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3897 if (p1 != p1prev) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3898 { |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3899 int *p2x = &charstart[(p1prev < leftmargin |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3900 ? leftmargin : p1prev) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3901 - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3902 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3903 |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3904 if (p2x < p2) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3905 *p2x++ = prevpos; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3906 while (p2x < p2) |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3907 *p2x++ = -1; |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3908 } |
|
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3909 } |
| 277 | 3910 } |
| 3911 | |
| 3912 val.hpos = - XINT (w->hscroll); | |
| 3913 if (val.hpos) | |
| 3914 val.hpos++; | |
| 3915 | |
| 3916 val.vpos = 1; | |
| 3917 | |
| 3918 lastpos = pos; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3919 lastpos_byte = pos_byte; |
| 277 | 3920 |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3921 /* Store 0 in this charstart line for the positions where |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3922 there is no character. But do leave what was recorded |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3923 for the character that ended the line. */ |
|
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3924 /* Add 1 in the endtest to compensate for the fact that ENDP was |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3925 made from WIDTH, which is 1 less than the window's actual |
|
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3926 internal width. */ |
|
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3927 i = p1 - p1start + 1; |
|
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3928 if (p1 < leftmargin) |
|
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3929 i += leftmargin - p1; |
|
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3930 for (; i < endp - p1start + 1; i++) |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3931 charstart[i] = 0; |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3932 |
| 277 | 3933 /* Handle continuation in middle of a character */ |
| 3934 /* by backing up over it */ | |
| 3935 if (p1 > endp) | |
| 3936 { | |
|
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3937 /* Don't back up if we never actually displayed any text. |
|
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3938 This occurs when the minibuffer prompt takes up the whole line. */ |
|
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3939 if (p1prev) |
|
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3940 { |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3941 /* Start the next line with that same character whose |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3942 character code is C and the length of multi-byte form is |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3943 LEN. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3944 pos = prevpos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3945 pos_byte = prevpos_byte; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3946 |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3947 if (p1_wide_column_end < endp) |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3948 /* As ENDP is not in the middle of wide-column character, |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3949 we can break the line at ENDP and start from the middle |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3950 column in the next line. So, adjust VAL.HPOS to skip |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3951 the columns output on this line. */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3952 val.hpos += p1prev - endp; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3953 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3954 { |
|
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3955 /* We displayed a wide-column character at around ENDP. |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3956 Since we can't broke it in the middle, the whole |
|
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3957 character should be driven into the next line. */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3958 /* As the result, the actual columns occupied by the |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3959 text on this line is less than WIDTH. VAL.TAB_OFFSET |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3960 must be adjusted. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3961 taboffset = taboffset + (p1prev - endp); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3962 /* Let's fill unused columns with TRUNCATOR or CONTINUER. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3963 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3964 GLYPH g = fix_glyph (f, truncate ? truncator : continuer, 0); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3965 while (p1prev < endp) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3966 *p1prev++ = g; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3967 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3968 /* If POINT is at POS, cursor should not on this line. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3969 lastpos = pos; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3970 lastpos_byte = pos_byte; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3971 if (PT == pos) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3972 cursor_vpos = -1; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3973 } |
|
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3974 } |
|
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3975 |
| 277 | 3976 /* Keep in this line everything up to the continuation column. */ |
| 3977 p1 = endp; | |
| 3978 } | |
| 3979 | |
| 3980 /* Finish deciding which character to start the next line on, | |
| 3981 and what hpos to start it at. | |
| 3982 Also set `lastpos' to the last position which counts as "on this line" | |
| 3983 for cursor-positioning. */ | |
| 3984 | |
| 3985 if (pos < ZV) | |
| 3986 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3987 if (FETCH_BYTE (pos_byte) == '\n') |
|
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3988 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3989 int opoint = PT, opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3990 |
|
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3991 /* If stopped due to a newline, start next line after it */ |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3992 TEMP_SET_PT_BOTH (pos + 1, pos_byte + 1); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3993 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3994 val.tab_offset = 0; |
|
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3995 /* Check again for hidden lines, in case the newline occurred exactly |
|
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3996 at the right margin. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3997 while (PT < ZV && selective > 0 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3998 && indented_beyond_p (PT, PT_BYTE, selective)) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3999 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4000 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4001 pos = PT, pos_byte = PT_BYTE; |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
4002 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
4003 } |
| 277 | 4004 else |
| 4005 /* Stopped due to right margin of window */ | |
| 4006 { | |
| 4007 if (truncate) | |
| 4008 { | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4009 int opoint = PT, opoint_byte = PT_BYTE; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4010 |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
4011 TEMP_SET_PT_BOTH (pos, pos_byte); |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4012 *p1++ = fix_glyph (f, truncator, 0); |
| 277 | 4013 /* Truncating => start next line after next newline, |
| 4014 and point is on this line if it is before the newline, | |
| 4015 and skip none of first char of next line */ | |
|
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
4016 do |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4017 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4018 while (PT < ZV && selective > 0 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4019 && indented_beyond_p (PT, PT_BYTE, selective)); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4020 pos = PT, pos_byte = PT_BYTE; |
| 277 | 4021 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
|
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
4022 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4023 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4024 lastpos = pos - (FETCH_BYTE (pos_byte - 1) == '\n'); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4025 lastpos_byte = CHAR_TO_BYTE (lastpos); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4026 val.tab_offset = 0; |
| 277 | 4027 } |
| 4028 else | |
| 4029 { | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4030 *p1++ = fix_glyph (f, continuer, 0); |
| 277 | 4031 val.vpos = 0; |
|
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
4032 DEC_BOTH (lastpos, lastpos_byte); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4033 val.tab_offset = taboffset + width; |
| 277 | 4034 } |
| 4035 } | |
| 4036 } | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4037 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4038 val.tab_offset = 0; |
| 277 | 4039 |
| 4040 /* If point is at eol or in invisible text at eol, | |
| 769 | 4041 record its frame location now. */ |
| 277 | 4042 |
| 6705 | 4043 if (start <= PT && PT <= lastpos && cursor_vpos < 0) |
| 277 | 4044 { |
| 4045 cursor_vpos = vpos; | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4046 cursor_hpos = p1 - leftmargin; |
| 277 | 4047 } |
| 4048 | |
| 4049 if (cursor_vpos == vpos) | |
| 4050 { | |
| 4051 if (cursor_hpos < 0) cursor_hpos = 0; | |
| 4052 if (cursor_hpos > width) cursor_hpos = width; | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4053 cursor_hpos += WINDOW_LEFT_MARGIN (w); |
| 769 | 4054 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) |
| 277 | 4055 { |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4056 this_line_bufpos = 0; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4057 |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4058 /* If this frame's cursor will be in its echo area, |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4059 don't record a cursor from the window text, |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4060 and turn off the optimization for cursor-motion-only case. */ |
|
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4061 if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (f) |
|
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4062 && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))) |
|
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4063 { |
|
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4064 FRAME_CURSOR_Y (f) = cursor_vpos; |
|
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4065 FRAME_CURSOR_X (f) = cursor_hpos; |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4066 |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4067 if (w == XWINDOW (selected_window)) |
| 277 | 4068 { |
|
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4069 /* Line is not continued and did not start |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4070 in middle of character */ |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4071 if ((hpos - WINDOW_LEFT_MARGIN (w) |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4072 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4073 && val.vpos) |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4074 { |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4075 this_line_bufpos = start; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4076 this_line_buffer = current_buffer; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4077 this_line_vpos = cursor_vpos; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4078 this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w); |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4079 this_line_endpos = Z - lastpos; |
|
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4080 } |
| 277 | 4081 } |
| 4082 } | |
| 4083 } | |
| 4084 } | |
| 4085 | |
| 4086 /* If hscroll and line not empty, insert truncation-at-left marker */ | |
| 4087 if (hscroll && lastpos != start) | |
| 4088 { | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4089 GLYPH g = fix_glyph (f, truncator, 0); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4090 *leftmargin = g; |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4091 if (p1 <= leftmargin) |
|
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4092 p1 = leftmargin + 1; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4093 else /* MULE: it may be a wide-column character */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4094 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4095 p1prev = leftmargin + 1; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4096 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4097 *p1prev++ = g; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4098 } |
| 277 | 4099 } |
| 4100 | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4101 if (!WINDOW_RIGHTMOST_P (w)) |
| 277 | 4102 { |
| 4103 endp++; | |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4104 if (p1 < leftmargin) p1 = leftmargin; |
| 277 | 4105 while (p1 < endp) *p1++ = SPACEGLYPH; |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4106 |
|
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
4107 /* Don't draw vertical bars if we're using scroll bars. They're |
|
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
4108 covered up by the scroll bars, and it's distracting to see |
|
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
4109 them when the scroll bar windows are flickering around to be |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4110 reconfigured. */ |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4111 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
|
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4112 { |
|
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4113 int i; |
|
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4114 for (i = 0; i < FRAME_SCROLL_BAR_COLS (f); i++) |
|
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4115 *p1++ = SPACEGLYPH; |
|
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4116 } |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4117 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4118 *p1++ = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) |
|
17362
87db7dfa4a96
(display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17317
diff
changeset
|
4119 ? XINT (DISP_BORDER_GLYPH (dp)) |
|
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4120 : '|'); |
| 277 | 4121 } |
| 4122 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], | |
| 4123 p1 - desired_glyphs->glyphs[vpos]); | |
| 4124 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
| 4125 | |
| 4126 /* If the start of this line is the overlay arrow-position, | |
| 4127 then put the arrow string into the display-line. */ | |
| 4128 | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4129 if (MARKERP (Voverlay_arrow_position) |
| 277 | 4130 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
| 4131 && start == marker_position (Voverlay_arrow_position) | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4132 && STRINGP (Voverlay_arrow_string) |
| 277 | 4133 && ! overlay_arrow_seen) |
| 4134 { | |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4135 int i, i_byte; |
| 277 | 4136 int len = XSTRING (Voverlay_arrow_string)->size; |
|
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4137 int arrow_end; |
| 277 | 4138 |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4139 if (len > width) |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4140 len = width; |
|
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4141 |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4142 /* If the arrow string has text props, obey them when displaying. */ |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4143 for (i = 0, i_byte = 0; i < len; ) |
|
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4144 { |
|
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4145 int c; |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4146 Lisp_Object face, ilisp; |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4147 int newface; |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4148 int idx = i; |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4149 |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4150 if (STRING_MULTIBYTE (Voverlay_arrow_string)) |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4151 FETCH_STRING_CHAR_ADVANCE (c, Voverlay_arrow_string, i, i_byte); |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4152 else |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4153 c = XSTRING (Voverlay_arrow_string)->data[i++]; |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4154 |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4155 XSETFASTINT (ilisp, i); |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4156 #ifdef HAVE_FACES |
|
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4157 if (FRAME_WINDOW_P (f)) |
|
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4158 { |
|
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4159 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); |
|
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4160 newface = compute_glyph_face_1 (f, face, 0); |
|
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4161 c = FAST_MAKE_GLYPH (c, newface); |
|
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4162 } |
| 9572 | 4163 #endif /* HAVE_FACES */ |
|
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4164 leftmargin[idx] = c; |
|
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4165 } |
|
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4166 |
|
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4167 /* Bug in SunOS 4.1.1 compiler requires this intermediate variable. */ |
|
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4168 arrow_end = (leftmargin - desired_glyphs->glyphs[vpos]) + len; |
|
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4169 if (desired_glyphs->used[vpos] < arrow_end) |
|
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4170 desired_glyphs->used[vpos] = arrow_end; |
| 277 | 4171 |
| 4172 overlay_arrow_seen = 1; | |
| 4173 } | |
| 4174 | |
| 4175 val.bufpos = pos; | |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4176 val.bytepos = pos_byte; |
|
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
4177 val.ovstring_chars_done = ovstr_done; |
| 277 | 4178 val_display_text_line = val; |
| 4179 return &val_display_text_line; | |
| 4180 } | |
| 4181 | |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4182 /* Redisplay the menu bar in the frame for window W. */ |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4183 |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4184 static void |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4185 display_menu_bar (w) |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4186 struct window *w; |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4187 { |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4188 Lisp_Object items, tail; |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4189 register int vpos = 0; |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4190 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
|
20689
10a3afa36ed2
(display_menu_bar): Don't set maxendcol too large.
Richard M. Stallman <rms@gnu.org>
parents:
20666
diff
changeset
|
4191 int maxendcol = FRAME_WIDTH (f); |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4192 int hpos = 0; |
|
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4193 int i; |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4194 |
|
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4195 #ifdef HAVE_NTGUI |
|
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
4196 if (!NILP (Vwindow_system)) |
|
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
4197 return; |
|
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4198 #endif |
|
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4199 |
|
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4200 #ifdef USE_X_TOOLKIT |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4201 if (FRAME_X_P (f)) |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4202 return; |
|
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4203 #endif /* USE_X_TOOLKIT */ |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4204 |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4205 get_display_line (f, vpos, 0); |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4206 |
|
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4207 items = FRAME_MENU_BAR_ITEMS (f); |
|
15111
6a5ae152de0d
(display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
15038
diff
changeset
|
4208 for (i = 0; i < XVECTOR (items)->size; i += 4) |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4209 { |
|
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4210 Lisp_Object pos, string; |
|
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4211 string = XVECTOR (items)->contents[i + 1]; |
|
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4212 if (NILP (string)) |
|
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4213 break; |
|
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4214 |
|
15111
6a5ae152de0d
(display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
15038
diff
changeset
|
4215 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos); |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4216 |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4217 if (hpos < maxendcol) |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4218 hpos = display_string (w, vpos, |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4219 XSTRING (string)->data, |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4220 STRING_BYTES (XSTRING (string)), |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4221 hpos, 0, 0, hpos, maxendcol, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4222 STRING_MULTIBYTE (string)); |
|
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
4223 /* Put a space between items. */ |
|
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4224 if (hpos < maxendcol) |
|
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4225 { |
|
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
4226 int hpos1 = hpos + 1; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4227 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4228 min (hpos1, maxendcol), maxendcol, 0); |
|
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4229 } |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4230 } |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4231 |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4232 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4233 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; |
|
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4234 |
|
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4235 /* Fill out the line with spaces. */ |
|
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4236 if (maxendcol > hpos) |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4237 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, maxendcol, maxendcol, 0); |
|
4423
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4238 |
|
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4239 /* Clear the rest of the lines allocated to the menu bar. */ |
|
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4240 vpos++; |
|
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4241 while (vpos < FRAME_MENU_BAR_LINES (f)) |
|
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4242 get_display_line (f, vpos++, 0); |
|
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4243 } |
|
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4244 |
| 277 | 4245 /* Display the mode line for window w */ |
| 4246 | |
| 4247 static void | |
| 4248 display_mode_line (w) | |
| 4249 struct window *w; | |
| 4250 { | |
| 4251 register int vpos = XFASTINT (w->height) + XFASTINT (w->top) - 1; | |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4252 register int left = WINDOW_LEFT_MARGIN (w); |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4253 register int right = WINDOW_RIGHT_MARGIN (w); |
| 769 | 4254 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
| 277 | 4255 |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4256 line_number_displayed = 0; |
|
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
4257 w->column_number_displayed = Qnil; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4258 |
| 769 | 4259 get_display_line (f, vpos, left); |
|
11354
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4260 |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4261 /* Temporarily make frame F's kboard the current kboard |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4262 so that kboard-local variables in the mode_line_format |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4263 will get the right values. */ |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4264 push_frame_kboard (f); |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4265 |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4266 display_mode_element (w, vpos, left, 0, right, right, |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4267 current_buffer->mode_line_format); |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4268 |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4269 pop_frame_kboard (); |
|
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4270 |
| 769 | 4271 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
| 277 | 4272 |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4273 /* Put the mode line in inverse video. |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4274 Use faces if possible, since that lets us handle |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4275 partial-width windows and avoid inverting the scroll bar columns. */ |
| 9572 | 4276 #ifdef HAVE_FACES |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4277 if (! FRAME_TERMCAP_P (f) && mode_line_inverse_video) |
|
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4278 { |
|
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4279 /* For a partial width window, explicitly set face of each glyph. */ |
|
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4280 int i; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4281 unsigned int padding; |
|
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4282 GLYPH *ptr = FRAME_DESIRED_GLYPHS (f)->glyphs[vpos]; |
|
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4283 for (i = left; i < right; ++i) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4284 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4285 padding = ptr[i] & GLYPH_MASK_PADDING; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4286 ptr[i] = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (ptr[i]), 1) | padding; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4287 } |
|
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4288 } |
|
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
4289 else |
|
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
4290 #endif |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4291 |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4292 /* Make the mode line inverse video if the entire line |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4293 is made of mode lines. |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4294 I.e. if this window is full width, |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4295 or if it is the child of a full width window |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4296 (which implies that that window is split side-by-side |
|
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4297 and the rest of this line is mode lines of the sibling windows). */ |
|
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
4298 if (WINDOW_FULL_WIDTH_P (w) |
|
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
4299 || WINDOW_FULL_WIDTH_P (XWINDOW (w->parent))) |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4300 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; |
| 277 | 4301 } |
| 4302 | |
| 4303 /* Contribute ELT to the mode line for window W. | |
| 4304 How it translates into text depends on its data type. | |
| 4305 | |
| 4306 VPOS is the position of the mode line being displayed. | |
| 4307 | |
| 769 | 4308 HPOS is the position (absolute on frame) where this element's text |
| 277 | 4309 should start. The output is truncated automatically at the right |
| 4310 edge of window W. | |
| 4311 | |
| 4312 DEPTH is the depth in recursion. It is used to prevent | |
| 4313 infinite recursion here. | |
| 4314 | |
| 4315 MINENDCOL is the hpos before which the element may not end. | |
| 4316 The element is padded at the right with spaces if nec | |
| 4317 to reach this column. | |
| 4318 | |
| 4319 MAXENDCOL is the hpos past which this element may not extend. | |
| 4320 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority. | |
| 4321 (This is necessary to make nested padding and truncation work.) | |
| 4322 | |
| 4323 Returns the hpos of the end of the text generated by ELT. | |
| 4324 The next element will receive that value as its HPOS arg, | |
| 4325 so as to concatenate the elements. */ | |
| 4326 | |
| 4327 static int | |
| 4328 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) | |
| 4329 struct window *w; | |
| 4330 register int vpos, hpos; | |
| 4331 int depth; | |
| 4332 int minendcol; | |
| 4333 register int maxendcol; | |
| 4334 register Lisp_Object elt; | |
| 4335 { | |
| 4336 tail_recurse: | |
| 4337 if (depth > 10) | |
| 4338 goto invalid; | |
| 4339 | |
| 4340 depth++; | |
| 4341 | |
|
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
4342 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
| 277 | 4343 { |
| 4344 case Lisp_String: | |
| 4345 { | |
| 4346 /* A string: output it and check for %-constructs within it. */ | |
| 4347 register unsigned char c; | |
| 4348 register unsigned char *this = XSTRING (elt)->data; | |
| 4349 | |
| 4350 while (hpos < maxendcol && *this) | |
| 4351 { | |
| 4352 unsigned char *last = this; | |
| 4353 while ((c = *this++) != '\0' && c != '%') | |
| 4354 ; | |
| 4355 if (this - 1 != last) | |
| 4356 { | |
| 4357 register int lim = --this - last + hpos; | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4358 if (frame_title_ptr) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4359 hpos = store_frame_title (last, hpos, min (lim, maxendcol)); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4360 else |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4361 hpos = display_string (w, vpos, last, -1, hpos, 0, 1, |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4362 hpos, min (lim, maxendcol), |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4363 STRING_MULTIBYTE (elt)); |
| 277 | 4364 } |
| 4365 else /* c == '%' */ | |
| 4366 { | |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4367 register int minendcol; |
| 277 | 4368 register int spec_width = 0; |
| 4369 | |
| 4370 /* We can't allow -ve args due to the "%-" construct */ | |
| 4371 /* Argument specifies minwidth but not maxwidth | |
| 4372 (maxwidth can be specified by | |
| 4373 (<negative-number> . <stuff>) mode-line elements) */ | |
| 4374 | |
| 4375 while ((c = *this++) >= '0' && c <= '9') | |
| 4376 { | |
| 4377 spec_width = spec_width * 10 + (c - '0'); | |
| 4378 } | |
| 4379 | |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4380 minendcol = hpos + spec_width; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4381 if (minendcol > maxendcol) |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4382 { |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4383 spec_width = maxendcol - hpos; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4384 minendcol = maxendcol; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4385 } |
| 277 | 4386 |
| 4387 if (c == 'M') | |
| 4388 hpos = display_mode_element (w, vpos, hpos, depth, | |
| 4389 spec_width, maxendcol, | |
| 4390 Vglobal_mode_string); | |
| 4391 else if (c != 0) | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4392 { |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4393 char *spec = decode_mode_spec (w, c, spec_width, |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4394 maxendcol - hpos); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4395 if (frame_title_ptr) |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4396 hpos = store_frame_title (spec, minendcol, maxendcol); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4397 else |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4398 hpos = display_string (w, vpos, spec, -1, |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4399 hpos, 0, 1, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4400 minendcol, maxendcol, -1); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4401 } |
| 277 | 4402 } |
| 4403 } | |
| 4404 } | |
| 4405 break; | |
| 4406 | |
| 4407 case Lisp_Symbol: | |
| 4408 /* A symbol: process the value of the symbol recursively | |
| 4409 as if it appeared here directly. Avoid error if symbol void. | |
| 4410 Special case: if value of symbol is a string, output the string | |
| 4411 literally. */ | |
| 4412 { | |
| 4413 register Lisp_Object tem; | |
| 4414 tem = Fboundp (elt); | |
| 485 | 4415 if (!NILP (tem)) |
| 277 | 4416 { |
| 4417 tem = Fsymbol_value (elt); | |
| 4418 /* If value is a string, output that string literally: | |
| 4419 don't check for % within it. */ | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4420 if (STRINGP (tem)) |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4421 { |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4422 if (frame_title_ptr) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4423 hpos = store_frame_title (XSTRING (tem)->data, |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4424 minendcol, maxendcol); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4425 else |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4426 hpos = display_string (w, vpos, XSTRING (tem)->data, |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4427 STRING_BYTES (XSTRING (tem)), |
|
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4428 hpos, 0, 1, minendcol, maxendcol, |
|
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4429 STRING_MULTIBYTE (tem)); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4430 } |
| 277 | 4431 /* Give up right away for nil or t. */ |
| 4432 else if (!EQ (tem, elt)) | |
| 4433 { elt = tem; goto tail_recurse; } | |
| 4434 } | |
| 4435 } | |
| 4436 break; | |
| 4437 | |
| 4438 case Lisp_Cons: | |
| 4439 { | |
| 4440 register Lisp_Object car, tem; | |
| 4441 | |
| 4442 /* A cons cell: three distinct cases. | |
| 4443 If first element is a string or a cons, process all the elements | |
| 4444 and effectively concatenate them. | |
| 4445 If first element is a negative number, truncate displaying cdr to | |
| 4446 at most that many characters. If positive, pad (with spaces) | |
| 4447 to at least that many characters. | |
| 4448 If first element is a symbol, process the cadr or caddr recursively | |
| 4449 according to whether the symbol's value is non-nil or nil. */ | |
| 4450 car = XCONS (elt)->car; | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4451 if (SYMBOLP (car)) |
| 277 | 4452 { |
| 4453 tem = Fboundp (car); | |
| 4454 elt = XCONS (elt)->cdr; | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4455 if (!CONSP (elt)) |
| 277 | 4456 goto invalid; |
| 4457 /* elt is now the cdr, and we know it is a cons cell. | |
| 4458 Use its car if CAR has a non-nil value. */ | |
| 485 | 4459 if (!NILP (tem)) |
| 277 | 4460 { |
| 4461 tem = Fsymbol_value (car); | |
| 485 | 4462 if (!NILP (tem)) |
| 277 | 4463 { elt = XCONS (elt)->car; goto tail_recurse; } |
| 4464 } | |
| 4465 /* Symbol's value is nil (or symbol is unbound) | |
| 4466 Get the cddr of the original list | |
| 4467 and if possible find the caddr and use that. */ | |
| 4468 elt = XCONS (elt)->cdr; | |
| 485 | 4469 if (NILP (elt)) |
| 277 | 4470 break; |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4471 else if (!CONSP (elt)) |
| 277 | 4472 goto invalid; |
| 4473 elt = XCONS (elt)->car; | |
| 4474 goto tail_recurse; | |
| 4475 } | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4476 else if (INTEGERP (car)) |
| 277 | 4477 { |
| 4478 register int lim = XINT (car); | |
| 4479 elt = XCONS (elt)->cdr; | |
| 4480 if (lim < 0) | |
| 4481 /* Negative int means reduce maximum width. | |
| 4482 DO NOT change MINENDCOL here! | |
| 4483 (20 -10 . foo) should truncate foo to 10 col | |
| 4484 and then pad to 20. */ | |
| 4485 maxendcol = min (maxendcol, hpos - lim); | |
| 4486 else if (lim > 0) | |
| 4487 { | |
| 4488 /* Padding specified. Don't let it be more than | |
| 4489 current maximum. */ | |
| 4490 lim += hpos; | |
| 4491 if (lim > maxendcol) | |
| 4492 lim = maxendcol; | |
| 4493 /* If that's more padding than already wanted, queue it. | |
| 4494 But don't reduce padding already specified even if | |
| 4495 that is beyond the current truncation point. */ | |
| 4496 if (lim > minendcol) | |
| 4497 minendcol = lim; | |
| 4498 } | |
| 4499 goto tail_recurse; | |
| 4500 } | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4501 else if (STRINGP (car) || CONSP (car)) |
| 277 | 4502 { |
| 4503 register int limit = 50; | |
| 4504 /* LIMIT is to protect against circular lists. */ | |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4505 while (CONSP (elt) && --limit > 0 |
| 277 | 4506 && hpos < maxendcol) |
| 4507 { | |
| 4508 hpos = display_mode_element (w, vpos, hpos, depth, | |
| 4509 hpos, maxendcol, | |
| 4510 XCONS (elt)->car); | |
| 4511 elt = XCONS (elt)->cdr; | |
| 4512 } | |
| 4513 } | |
| 4514 } | |
| 4515 break; | |
| 4516 | |
| 4517 default: | |
| 4518 invalid: | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4519 if (frame_title_ptr) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4520 hpos = store_frame_title ("*invalid*", minendcol, maxendcol); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4521 else |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4522 hpos = display_string (w, vpos, "*invalid*", -1, hpos, 0, 1, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4523 minendcol, maxendcol, 0); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4524 return hpos; |
| 277 | 4525 } |
| 4526 | |
| 4527 if (minendcol > hpos) | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4528 if (frame_title_ptr) |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4529 hpos = store_frame_title ("", minendcol, maxendcol); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4530 else |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4531 hpos = display_string (w, vpos, "", 0, hpos, |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4532 0, 1, minendcol, maxendcol, 0); |
| 277 | 4533 return hpos; |
| 4534 } | |
| 4535 | |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4536 /* Write a null-terminated, right justified decimal representation of |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4537 the positive integer D to BUF using a minimal field width WIDTH. */ |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4538 |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4539 static void |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4540 pint2str (buf, width, d) |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4541 register char *buf; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4542 register int width; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4543 register int d; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4544 { |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4545 register char *p = buf; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4546 |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4547 if (d <= 0) |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4548 *p++ = '0'; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4549 else |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4550 while (d > 0) |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4551 { |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4552 *p++ = d % 10 + '0'; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4553 d /= 10; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4554 } |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4555 for (width -= (int) (p - buf); width > 0; --width) *p++ = ' '; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4556 *p-- = '\0'; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4557 while (p > buf) |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4558 { |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4559 d = *buf; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4560 *buf++ = *p; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4561 *p-- = d; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4562 } |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4563 } |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4564 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4565 /* Set a mnemonic character for CODING_SYSTEM (Lisp symbol) in BUF. |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4566 If EOL_FLAG is 1, set also a mnemonic character for end-of-line |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4567 type of CODING_SYSTEM. Return updated pointer into BUF. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4568 |
|
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
4569 static unsigned char invalid_eol_type[] = "(*invalid*)"; |
|
24199
204d0a24ddf5
(decode_mode_spec_coding): Display the EOL type as a string.
Eli Zaretskii <eliz@gnu.org>
parents:
24040
diff
changeset
|
4570 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4571 static char * |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4572 decode_mode_spec_coding (coding_system, buf, eol_flag) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4573 Lisp_Object coding_system; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4574 register char *buf; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4575 int eol_flag; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4576 { |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4577 Lisp_Object val; |
|
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4578 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
|
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4579 unsigned char *eol_str; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4580 int eol_str_len; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4581 /* The EOL conversion we are using. */ |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4582 Lisp_Object eoltype; |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4583 |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4584 val = coding_system; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4585 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4586 if (NILP (val)) /* Not yet decided. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4587 { |
|
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4588 if (multibyte) |
|
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4589 *buf++ = '-'; |
|
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
4590 if (eol_flag) |
|
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4591 eoltype = eol_mnemonic_undecided; |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4592 /* Don't mention EOL conversion if it isn't decided. */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4593 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4594 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4595 { |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4596 Lisp_Object eolvalue; |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4597 |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4598 eolvalue = Fget (coding_system, Qeol_type); |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4599 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4600 while (!NILP (val) && SYMBOLP (val)) |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4601 { |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4602 val = Fget (val, Qcoding_system); |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4603 if (NILP (eolvalue)) |
|
18834
a4b74a7b692a
(decode_mode_spec_coding): Fix typo; use `val' instead of `coding-system'.
Richard M. Stallman <rms@gnu.org>
parents:
18829
diff
changeset
|
4604 eolvalue = Fget (val, Qeol_type); |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4605 } |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4606 |
|
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4607 if (multibyte) |
|
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4608 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
|
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4609 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4610 if (eol_flag) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4611 { |
|
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4612 /* The EOL conversion that is normal on this system. */ |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4613 |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4614 if (NILP (eolvalue)) /* Not yet decided. */ |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4615 eoltype = eol_mnemonic_undecided; |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4616 else if (VECTORP (eolvalue)) /* Not yet decided. */ |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4617 eoltype = eol_mnemonic_undecided; |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4618 else /* INTEGERP (eolvalue) -- 0:LF, 1:CRLF, 2:CR */ |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4619 eoltype = (XFASTINT (eolvalue) == 0 |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4620 ? eol_mnemonic_unix |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4621 : (XFASTINT (eolvalue) == 1 |
|
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4622 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4623 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4624 } |
|
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4625 |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4626 if (eol_flag) |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4627 { |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4628 /* Mention the EOL conversion if it is not the usual one. */ |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4629 if (STRINGP (eoltype)) |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4630 { |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4631 eol_str = XSTRING (eoltype)->data; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4632 eol_str_len = XSTRING (eoltype)->size; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4633 } |
|
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4634 else if (INTEGERP (eoltype) |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4635 && CHAR_VALID_P (XINT (eoltype), 0)) |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4636 { |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4637 int c = XINT (eoltype); |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4638 unsigned char work[4]; |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4639 |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4640 eol_str_len = CHAR_STRING (XINT (eoltype), work, eol_str); |
|
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4641 } |
|
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4642 else |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4643 { |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4644 eol_str = invalid_eol_type; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4645 eol_str_len = sizeof (invalid_eol_type) - 1; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4646 } |
|
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
4647 bcopy (eol_str, buf, eol_str_len); |
|
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4648 buf += eol_str_len; |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4649 } |
|
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4650 |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4651 return buf; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4652 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4653 |
| 277 | 4654 /* Return a string for the output of a mode line %-spec for window W, |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4655 generated by character C. SPEC_WIDTH is the field width when |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4656 padding to the left (%c, %l). The value returned from this |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4657 function will later be truncated to width MAXWIDTH. */ |
| 277 | 4658 |
|
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4659 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------"; |
|
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4660 |
| 277 | 4661 static char * |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4662 decode_mode_spec (w, c, spec_width, maxwidth) |
| 277 | 4663 struct window *w; |
| 4664 register char c; | |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4665 register int spec_width; |
| 277 | 4666 register int maxwidth; |
| 4667 { | |
|
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4668 Lisp_Object obj; |
| 769 | 4669 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
| 4670 char *decode_mode_spec_buf = (char *) FRAME_TEMP_GLYPHS (f)->total_contents; | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4671 struct buffer *b = XBUFFER (w->buffer); |
| 277 | 4672 |
|
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4673 obj = Qnil; |
| 769 | 4674 if (maxwidth > FRAME_WIDTH (f)) |
| 4675 maxwidth = FRAME_WIDTH (f); | |
| 277 | 4676 |
| 4677 switch (c) | |
| 4678 { | |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4679 case '*': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4680 if (!NILP (b->read_only)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4681 return "%"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4682 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4683 return "*"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4684 return "-"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4685 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4686 case '+': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4687 /* This differs from %* only for a modified read-only buffer. */ |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4688 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4689 return "*"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4690 if (!NILP (b->read_only)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4691 return "%"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4692 return "-"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4693 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4694 case '&': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4695 /* This differs from %* in ignoring read-only-ness. */ |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4696 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4697 return "*"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4698 return "-"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4699 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4700 case '%': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4701 return "%"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4702 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4703 case '[': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4704 { |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4705 int i; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4706 char *p; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4707 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4708 if (command_loop_level > 5) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4709 return "[[[... "; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4710 p = decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4711 for (i = 0; i < command_loop_level; i++) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4712 *p++ = '['; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4713 *p = 0; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4714 return decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4715 } |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4716 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4717 case ']': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4718 { |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4719 int i; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4720 char *p; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4721 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4722 if (command_loop_level > 5) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4723 return " ...]]]"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4724 p = decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4725 for (i = 0; i < command_loop_level; i++) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4726 *p++ = ']'; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4727 *p = 0; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4728 return decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4729 } |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4730 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4731 case '-': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4732 { |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4733 register char *p; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4734 register int i; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4735 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4736 if (maxwidth < sizeof (lots_of_dashes)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4737 return lots_of_dashes; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4738 else |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4739 { |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4740 for (p = decode_mode_spec_buf, i = maxwidth; i > 0; i--) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4741 *p++ = '-'; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4742 *p = '\0'; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4743 } |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4744 return decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4745 } |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4746 |
| 277 | 4747 case 'b': |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4748 obj = b->name; |
| 277 | 4749 #if 0 |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4750 if (maxwidth >= 3 && STRING_BYTES (XSTRING (obj)) > maxwidth) |
| 277 | 4751 { |
| 4752 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1); | |
| 4753 decode_mode_spec_buf[maxwidth - 1] = '\\'; | |
| 4754 decode_mode_spec_buf[maxwidth] = '\0'; | |
| 4755 return decode_mode_spec_buf; | |
| 4756 } | |
| 4757 #endif | |
| 4758 break; | |
| 4759 | |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4760 case 'c': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4761 { |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4762 int col = current_column (); |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4763 XSETFASTINT (w->column_number_displayed, col); |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4764 pint2str (decode_mode_spec_buf, spec_width, col); |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4765 return decode_mode_spec_buf; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4766 } |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4767 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4768 case 'F': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4769 /* %F displays the frame name. */ |
|
20039
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4770 /* Systems that can only display a single frame at a time should |
|
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4771 NOT replace the frame name with the (constant) frame title, |
|
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4772 since then they won't be able to tell which frame is that. */ |
|
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4773 if (FRAME_WINDOW_P (f) && !NILP (f->title)) |
|
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4774 return (char *) XSTRING (f->title)->data; |
|
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
4775 if (f->explicit_name || ! FRAME_WINDOW_P (f)) |
|
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4776 return (char *) XSTRING (f->name)->data; |
|
12348
7d39ee7e0ca3
(decode_mode_spec) [!MULTI_FRAME]: Handle %F properly.
Richard M. Stallman <rms@gnu.org>
parents:
12293
diff
changeset
|
4777 return "Emacs"; |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4778 |
| 277 | 4779 case 'f': |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4780 obj = b->filename; |
| 277 | 4781 #if 0 |
| 485 | 4782 if (NILP (obj)) |
| 277 | 4783 return "[none]"; |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4784 else if (STRINGP (obj) && STRING_BYTES (XSTRING (obj)) > maxwidth) |
| 277 | 4785 { |
| 4786 bcopy ("...", decode_mode_spec_buf, 3); | |
|
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4787 bcopy (XSTRING (obj)->data + STRING_BYTES (XSTRING (obj)) - maxwidth + 3, |
| 277 | 4788 decode_mode_spec_buf + 3, maxwidth - 3); |
| 4789 return decode_mode_spec_buf; | |
| 4790 } | |
| 4791 #endif | |
| 4792 break; | |
| 4793 | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4794 case 'l': |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4795 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4796 int startpos = XMARKER (w->start)->charpos; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4797 int startpos_byte = marker_byte_position (w->start); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4798 int line, linepos, linepos_byte, topline; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4799 int nlines, junk; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4800 Lisp_Object tem; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4801 int height = XFASTINT (w->height); |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4802 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4803 /* If we decided that this buffer isn't suitable for line numbers, |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4804 don't forget that too fast. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4805 if (EQ (w->base_line_pos, w->buffer)) |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4806 goto no_value; |
|
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4807 /* But do forget it, if the window shows a different buffer now. */ |
|
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4808 else if (BUFFERP (w->base_line_pos)) |
|
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4809 w->base_line_pos = Qnil; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4810 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4811 /* If the buffer is very big, don't waste time. */ |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4812 if (BUF_ZV (b) - BUF_BEGV (b) > line_number_display_limit) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4813 { |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4814 w->base_line_pos = Qnil; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4815 w->base_line_number = Qnil; |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4816 goto no_value; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4817 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4818 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4819 if (!NILP (w->base_line_number) |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4820 && !NILP (w->base_line_pos) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4821 && XFASTINT (w->base_line_pos) <= startpos) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4822 { |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4823 line = XFASTINT (w->base_line_number); |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4824 linepos = XFASTINT (w->base_line_pos); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4825 linepos_byte = buf_charpos_to_bytepos (b, linepos); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4826 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4827 else |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4828 { |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4829 line = 1; |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4830 linepos = BUF_BEGV (b); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4831 linepos_byte = BUF_BEGV_BYTE (b); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4832 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4833 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4834 /* Count lines from base line to window start position. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4835 nlines = display_count_lines (linepos, linepos_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4836 startpos_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4837 startpos, &junk); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4838 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4839 topline = nlines + line; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4840 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4841 /* Determine a new base line, if the old one is too close |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4842 or too far away, or if we did not have one. |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4843 "Too close" means it's plausible a scroll-down would |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4844 go back past it. */ |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4845 if (startpos == BUF_BEGV (b)) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4846 { |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4847 XSETFASTINT (w->base_line_number, topline); |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4848 XSETFASTINT (w->base_line_pos, BUF_BEGV (b)); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4849 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4850 else if (nlines < height + 25 || nlines > height * 3 + 50 |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4851 || linepos == BUF_BEGV (b)) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4852 { |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4853 int limit = BUF_BEGV (b); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4854 int limit_byte = BUF_BEGV_BYTE (b); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4855 int position; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4856 int distance = (height * 2 + 30) * 200; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4857 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4858 if (startpos - distance > limit) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4859 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4860 limit = startpos - distance; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4861 limit_byte = CHAR_TO_BYTE (limit); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4862 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4863 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4864 nlines = display_count_lines (startpos, startpos_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4865 limit_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4866 - (height * 2 + 30), |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4867 &position); |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4868 /* If we couldn't find the lines we wanted within |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4869 200 chars per line, |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4870 give up on line numbers for this window. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4871 if (position == limit_byte && limit == startpos - distance) |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4872 { |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4873 w->base_line_pos = w->buffer; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4874 w->base_line_number = Qnil; |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4875 goto no_value; |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4876 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4877 |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4878 XSETFASTINT (w->base_line_number, topline - nlines); |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4879 XSETFASTINT (w->base_line_pos, BYTE_TO_CHAR (position)); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4880 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4881 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4882 /* Now count lines from the start pos to point. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4883 nlines = display_count_lines (startpos, startpos_byte, |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4884 PT_BYTE, PT, &junk); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4885 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4886 /* Record that we did display the line number. */ |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4887 line_number_displayed = 1; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4888 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4889 /* Make the string to show. */ |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4890 pint2str (decode_mode_spec_buf, spec_width, topline + nlines); |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4891 return decode_mode_spec_buf; |
|
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4892 no_value: |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4893 { |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4894 char* p = decode_mode_spec_buf; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4895 for (spec_width -= 2; spec_width > 0; --spec_width) *p++ = ' '; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4896 strcpy (p, "??"); |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4897 return decode_mode_spec_buf; |
|
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4898 } |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4899 } |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4900 break; |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4901 |
| 277 | 4902 case 'm': |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4903 obj = b->mode_name; |
| 277 | 4904 break; |
| 4905 | |
| 4906 case 'n': | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4907 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
| 277 | 4908 return " Narrow"; |
| 4909 break; | |
| 4910 | |
| 4911 case 'p': | |
| 4912 { | |
| 4913 int pos = marker_position (w->start); | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4914 int total = BUF_ZV (b) - BUF_BEGV (b); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4915 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4916 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
| 277 | 4917 { |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4918 if (pos <= BUF_BEGV (b)) |
| 277 | 4919 return "All"; |
| 4920 else | |
| 4921 return "Bottom"; | |
| 4922 } | |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4923 else if (pos <= BUF_BEGV (b)) |
| 277 | 4924 return "Top"; |
| 4925 else | |
| 4926 { | |
|
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4927 if (total > 1000000) |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4928 /* Do it differently for a large value, to avoid overflow. */ |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4929 total = ((pos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4930 else |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4931 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
| 277 | 4932 /* We can't normally display a 3-digit number, |
| 4933 so get us a 2-digit number that is close. */ | |
| 4934 if (total == 100) | |
| 4935 total = 99; | |
| 4936 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
| 4937 return decode_mode_spec_buf; | |
| 4938 } | |
| 4939 } | |
| 4940 | |
|
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4941 /* Display percentage of size above the bottom of the screen. */ |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4942 case 'P': |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4943 { |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4944 int toppos = marker_position (w->start); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4945 int botpos = BUF_Z (b) - XFASTINT (w->window_end_pos); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4946 int total = BUF_ZV (b) - BUF_BEGV (b); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4947 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4948 if (botpos >= BUF_ZV (b)) |
|
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4949 { |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4950 if (toppos <= BUF_BEGV (b)) |
|
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4951 return "All"; |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4952 else |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4953 return "Bottom"; |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4954 } |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4955 else |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4956 { |
|
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4957 if (total > 1000000) |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4958 /* Do it differently for a large value, to avoid overflow. */ |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4959 total = ((botpos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4960 else |
|
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4961 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total; |
|
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4962 /* We can't normally display a 3-digit number, |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4963 so get us a 2-digit number that is close. */ |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4964 if (total == 100) |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4965 total = 99; |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4966 if (toppos <= BUF_BEGV (b)) |
|
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4967 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4968 else |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4969 sprintf (decode_mode_spec_buf, "%2d%%", total); |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4970 return decode_mode_spec_buf; |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4971 } |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4972 } |
|
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4973 |
|
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4974 case 's': |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4975 /* status of process */ |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4976 obj = Fget_buffer_process (w->buffer); |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4977 if (NILP (obj)) |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4978 return "no process"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4979 #ifdef subprocesses |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4980 obj = Fsymbol_name (Fprocess_status (obj)); |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4981 #endif |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4982 break; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4983 |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4984 case 't': /* indicate TEXT or BINARY */ |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4985 #ifdef MODE_LINE_BINARY_TEXT |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4986 return MODE_LINE_BINARY_TEXT (b); |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4987 #else |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4988 return "T"; |
|
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4989 #endif |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4990 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4991 case 'z': |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4992 /* coding-system (not including end-of-line format) */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4993 case 'Z': |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4994 /* coding-system (including end-of-line type) */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4995 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4996 int eol_flag = (c == 'Z'); |
|
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
4997 char *p = decode_mode_spec_buf; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4998 |
|
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
4999 if (! FRAME_WINDOW_P (f)) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5000 { |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5001 /* No need to mention EOL here--the terminal never needs |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5002 to do EOL conversion. */ |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5003 p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0); |
|
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5004 p = decode_mode_spec_coding (terminal_coding.symbol, p, 0); |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5005 } |
|
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
5006 p = decode_mode_spec_coding (b->buffer_file_coding_system, |
|
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
5007 p, eol_flag); |
|
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
5008 |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5009 #if 0 /* This proves to be annoying; I think we can do without. -- rms. */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5010 #ifdef subprocesses |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5011 obj = Fget_buffer_process (Fcurrent_buffer ()); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5012 if (PROCESSP (obj)) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5013 { |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5014 p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5015 p, eol_flag); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5016 p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system, |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5017 p, eol_flag); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5018 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5019 #endif /* subprocesses */ |
|
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5020 #endif /* 0 */ |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5021 *p = 0; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5022 return decode_mode_spec_buf; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5023 } |
| 277 | 5024 } |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5025 |
|
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
5026 if (STRINGP (obj)) |
| 277 | 5027 return (char *) XSTRING (obj)->data; |
| 5028 else | |
| 5029 return ""; | |
| 5030 } | |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5031 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5032 /* Count up to COUNT lines starting from START / START_BYTE. |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5033 But don't go beyond LIMIT_BYTE. |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5034 Return the number of lines thus found (always nonnegative). |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5035 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5036 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */ |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5037 |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5038 static int |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5039 display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5040 int start, start_byte, limit_byte, count; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5041 int *byte_pos_ptr; |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5042 { |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5043 register unsigned char *cursor; |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5044 unsigned char *base; |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5045 |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5046 register int ceiling; |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5047 register unsigned char *ceiling_addr; |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5048 int orig_count = count; |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5049 |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5050 /* If we are not in selective display mode, |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5051 check only for newlines. */ |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5052 int selective_display = (!NILP (current_buffer->selective_display) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5053 && !INTEGERP (current_buffer->selective_display)); |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5054 |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5055 if (count > 0) |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5056 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5057 while (start_byte < limit_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5058 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5059 ceiling = BUFFER_CEILING_OF (start_byte); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5060 ceiling = min (limit_byte - 1, ceiling); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5061 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5062 base = (cursor = BYTE_POS_ADDR (start_byte)); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5063 while (1) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5064 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5065 if (selective_display) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5066 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5067 ; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5068 else |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5069 while (*cursor != '\n' && ++cursor != ceiling_addr) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5070 ; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5071 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5072 if (cursor != ceiling_addr) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5073 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5074 if (--count == 0) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5075 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5076 start_byte += cursor - base + 1; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5077 *byte_pos_ptr = start_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5078 return orig_count; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5079 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5080 else |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5081 if (++cursor == ceiling_addr) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5082 break; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5083 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5084 else |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5085 break; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5086 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5087 start_byte += cursor - base; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5088 } |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5089 } |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5090 else |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5091 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5092 while (start_byte > limit_byte) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5093 { |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5094 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5095 ceiling = max (limit_byte, ceiling); |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5096 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5097 base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1); |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5098 while (1) |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5099 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5100 if (selective_display) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5101 while (--cursor != ceiling_addr |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5102 && *cursor != '\n' && *cursor != 015) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5103 ; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5104 else |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5105 while (--cursor != ceiling_addr && *cursor != '\n') |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5106 ; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5107 |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5108 if (cursor != ceiling_addr) |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5109 { |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5110 if (++count == 0) |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5111 { |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5112 start_byte += cursor - base + 1; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5113 *byte_pos_ptr = start_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5114 /* When scanning backwards, we should |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5115 not count the newline posterior to which we stop. */ |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5116 return - orig_count - 1; |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5117 } |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5118 } |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5119 else |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5120 break; |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5121 } |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5122 /* Here we add 1 to compensate for the last decrement |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5123 of CURSOR, which took it past the valid range. */ |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5124 start_byte += cursor - base + 1; |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5125 } |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5126 } |
|
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5127 |
|
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5128 *byte_pos_ptr = limit_byte; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5129 |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5130 if (count < 0) |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5131 return - orig_count + count; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5132 return orig_count - count; |
|
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5133 |
|
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5134 } |
| 277 | 5135 |
| 5136 /* Display STRING on one line of window W, starting at HPOS. | |
| 5137 Display at position VPOS. Caller should have done get_display_line. | |
|
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
5138 If VPOS == -1, display it as the current frame's title. |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5139 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated. |
| 277 | 5140 |
| 5141 TRUNCATE is GLYPH to display at end if truncated. Zero for none. | |
| 5142 | |
| 5143 MINCOL is the first column ok to end at. (Pad with spaces to this col.) | |
| 5144 MAXCOL is the last column ok to end at. Truncate here. | |
| 5145 -1 for MINCOL or MAXCOL means no explicit minimum or maximum. | |
| 769 | 5146 Both count from the left edge of the frame, as does HPOS. |
| 277 | 5147 The right edge of W is an implicit maximum. |
| 5148 If TRUNCATE is nonzero, the implicit maximum is one column before the edge. | |
| 5149 | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5150 OBEY_WINDOW_WIDTH says to put spaces or vertical bars |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5151 at the place where the current window ends in this line |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5152 and not display anything beyond there. Otherwise, only MAXCOL |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5153 controls where to stop output. |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5154 |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5155 MULTIBYTE can be 0 meaning do not display multibyte chars, |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5156 1 meaning do display them, or -1 meaning obey the current buffer's |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5157 value of enable_multibyte_characters. |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5158 |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5159 Returns ending hpos. */ |
| 277 | 5160 |
| 5161 static int | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5162 display_string (w, vpos, string, length, hpos, truncate, |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5163 obey_window_width, mincol, maxcol, multibyte) |
| 277 | 5164 struct window *w; |
| 5165 unsigned char *string; | |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5166 int length; |
| 277 | 5167 int vpos, hpos; |
| 5168 GLYPH truncate; | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5169 int obey_window_width; |
| 277 | 5170 int mincol, maxcol; |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5171 int multibyte; |
| 277 | 5172 { |
| 5173 register int c; | |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5174 int truncated; |
| 277 | 5175 register GLYPH *p1; |
| 5176 int hscroll = XINT (w->hscroll); | |
|
1600
775c2ab9800f
* xdisp.c (display_string): Use w's buffer's value of
Jim Blandy <jimb@redhat.com>
parents:
1527
diff
changeset
|
5177 int tab_width = XINT (XBUFFER (w->buffer)->tab_width); |
| 277 | 5178 register GLYPH *start; |
| 5179 register GLYPH *end; | |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5180 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5181 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
| 277 | 5182 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos; |
| 5183 int window_width = XFASTINT (w->width); | |
| 5184 | |
| 5185 /* Use the standard display table, not the window's display table. | |
| 5186 We don't want the mode line in rot13. */ | |
|
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
5187 register struct Lisp_Char_Table *dp = 0; |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5188 int i; |
| 277 | 5189 |
|
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5190 if (multibyte == -1) |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5191 multibyte = !NILP (current_buffer->enable_multibyte_characters); |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5192 /* Now multibyte is 1 if we should display multibyte characters. */ |
|
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5193 |
|
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
5194 if (DISP_TABLE_P (Vstandard_display_table)) |
|
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
5195 dp = XCHAR_TABLE (Vstandard_display_table); |
| 277 | 5196 |
|
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
5197 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 277 | 5198 |
| 5199 p1 = p1start; | |
|
18852
ab7fae992236
(display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents:
18834
diff
changeset
|
5200 start = desired_glyphs->glyphs[vpos]; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5201 |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5202 if (obey_window_width) |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5203 { |
|
18852
ab7fae992236
(display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents:
18834
diff
changeset
|
5204 start += XFASTINT (w->left); |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5205 end = start + window_width - (truncate != 0); |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5206 |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5207 if (!WINDOW_RIGHTMOST_P (w)) |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5208 { |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5209 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5210 { |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5211 int i; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5212 |
|
8943
a9e40d478857
(display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
5213 for (i = 0; i < FRAME_SCROLL_BAR_COLS (f); i++) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5214 *end-- = ' '; |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5215 } |
|
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5216 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5217 *end-- = '|'; |
|
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5218 } |
|
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5219 } |
| 277 | 5220 |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5221 if (! obey_window_width |
|
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5222 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol)) |
| 277 | 5223 end = desired_glyphs->glyphs[vpos] + maxcol; |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5224 |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5225 /* Store 0 in charstart for these columns. */ |
|
6704
a00c6f4747be
(display_string): Allow for negative hpos when clearing array.
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
5226 for (i = (hpos >= 0 ? hpos : 0); i < end - p1start + hpos; i++) |
|
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5227 desired_glyphs->charstarts[vpos][i] = 0; |
|
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5228 |
| 277 | 5229 if (maxcol >= 0 && mincol > maxcol) |
| 5230 mincol = maxcol; | |
| 5231 | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5232 if (length < 0) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5233 /* We need this value for multibyte characters. */ |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5234 length = strlen (string); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5235 |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5236 /* We set truncated to 1 if we get stopped by trying to pass END |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5237 (that is, trying to pass MAXCOL.) */ |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5238 truncated = 0; |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5239 while (1) |
| 277 | 5240 { |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5241 int len; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5242 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5243 if (length <= 0) |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5244 break; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5245 if (multibyte) |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5246 c = STRING_CHAR_AND_LENGTH (string, length, len); |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5247 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5248 c = *string, len = 1; |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5249 |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5250 string += len, length -= len; |
|
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5251 |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5252 if (p1 >= end) |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5253 { |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5254 truncated = 1; |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5255 break; |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5256 } |
|
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5257 |
|
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5258 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5259 { |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5260 p1 = copy_part_of_rope (f, p1, start, |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5261 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5262 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5263 0); |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5264 } |
|
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5265 else if (c >= 040 && c < 0177) |
| 277 | 5266 { |
| 5267 if (p1 >= start) | |
| 5268 *p1 = c; | |
| 5269 p1++; | |
| 5270 } | |
| 5271 else if (c == '\t') | |
| 5272 { | |
| 5273 do | |
| 5274 { | |
| 5275 if (p1 >= start && p1 < end) | |
| 5276 *p1 = SPACEGLYPH; | |
| 5277 p1++; | |
| 5278 } | |
| 5279 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width); | |
| 5280 } | |
|
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5281 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow)) |
| 277 | 5282 { |
| 5283 if (p1 >= start) | |
|
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5284 *p1 = (fix_glyph |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5285 (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5286 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (dp))) |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5287 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
|
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5288 0)); |
| 277 | 5289 p1++; |
| 368 | 5290 if (p1 >= start && p1 < end) |
| 277 | 5291 *p1 = c ^ 0100; |
| 5292 p1++; | |
| 5293 } | |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5294 else |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5295 { |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5296 /* C is a multibyte character, control character or a binary |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5297 byte data. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5298 int remaining_bytes = len; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5299 |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5300 if (c >= 0400 && CHAR_VALID_P (c, 0)) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5301 { |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5302 /* C is a multibyte character. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5303 int charset = CHAR_CHARSET (c); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5304 int columns = (charset == CHARSET_COMPOSITION |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5305 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5306 : CHARSET_WIDTH (charset)); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5307 |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5308 remaining_bytes -= CHARSET_BYTES (charset); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5309 if (p1 < start) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5310 { |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5311 /* Since we can't show the left part of C, fill all |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5312 columns with spaces. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5313 columns -= start - p1; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5314 p1 = start; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5315 while (columns--) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5316 { |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5317 if (p1 < end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5318 *p1 = SPACEGLYPH; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5319 p1++; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5320 } |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5321 } |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5322 else if (p1 + columns > end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5323 { |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5324 /* Since we can't show the right part of C, fill all |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5325 columns with TRUNCATE if TRUNCATE is specified. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5326 if (truncate) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5327 { |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5328 while (p1 < end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5329 *p1++ = fix_glyph (f, truncate, 0); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5330 /* And tell the line is truncated. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5331 truncated = 1; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5332 } |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5333 break; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5334 } |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5335 else |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5336 { |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5337 /* We can show the whole glyph of C. */ |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5338 *p1++ = c; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5339 while (--columns) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5340 *p1++ = c | GLYPH_MASK_PADDING; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5341 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5342 } |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5343 |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5344 while (remaining_bytes > 0) |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5345 { |
|
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5346 c = *(string - remaining_bytes--); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5347 |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5348 if (p1 >= start) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5349 *p1 = (fix_glyph |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5350 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5351 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5352 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5353 0)); |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5354 p1++; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5355 if (p1 >= start && p1 < end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5356 *p1 = (c >> 6) + '0'; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5357 p1++; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5358 if (p1 >= start && p1 < end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5359 *p1 = (7 & (c >> 3)) + '0'; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5360 p1++; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5361 if (p1 >= start && p1 < end) |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5362 *p1 = (7 & c) + '0'; |
|
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5363 p1++; |
|
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5364 } |
|
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5365 } |
| 277 | 5366 } |
| 5367 | |
|
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5368 if (truncated) |
| 277 | 5369 { |
| 5370 p1 = end; | |
|
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5371 if (truncate) *p1++ = fix_glyph (f, truncate, 0); |
| 277 | 5372 } |
| 5373 else if (mincol >= 0) | |
| 5374 { | |
| 5375 end = desired_glyphs->glyphs[vpos] + mincol; | |
| 5376 while (p1 < end) | |
| 5377 *p1++ = SPACEGLYPH; | |
| 5378 } | |
| 5379 | |
| 5380 { | |
| 5381 register int len = p1 - desired_glyphs->glyphs[vpos]; | |
| 5382 | |
| 5383 if (len > desired_glyphs->used[vpos]) | |
| 5384 desired_glyphs->used[vpos] = len; | |
| 5385 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
| 5386 | |
| 5387 return len; | |
| 5388 } | |
| 5389 } | |
| 5390 | |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5391 /* This is like a combination of memq and assq. |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5392 Return 1 if PROPVAL appears as an element of LIST |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5393 or as the car of an element of LIST. |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5394 If PROPVAL is a list, compare each element against LIST |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5395 in that way, and return 1 if any element of PROPVAL is found in LIST. |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5396 Otherwise return 0. |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5397 This function cannot quit. */ |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5398 |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5399 int |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5400 invisible_p (propval, list) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5401 register Lisp_Object propval; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5402 Lisp_Object list; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5403 { |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5404 register Lisp_Object tail, proptail; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5405 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5406 { |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5407 register Lisp_Object tem; |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5408 tem = XCONS (tail)->car; |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5409 if (EQ (propval, tem)) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5410 return 1; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5411 if (CONSP (tem) && EQ (propval, XCONS (tem)->car)) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5412 return 1; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5413 } |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5414 if (CONSP (propval)) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5415 for (proptail = propval; CONSP (proptail); |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5416 proptail = XCONS (proptail)->cdr) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5417 { |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5418 Lisp_Object propelt; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5419 propelt = XCONS (proptail)->car; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5420 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5421 { |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5422 register Lisp_Object tem; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5423 tem = XCONS (tail)->car; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5424 if (EQ (propelt, tem)) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5425 return 1; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5426 if (CONSP (tem) && EQ (propelt, XCONS (tem)->car)) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5427 return 1; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5428 } |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5429 } |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5430 return 0; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5431 } |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5432 |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5433 /* Return 1 if PROPVAL appears as the car of an element of LIST |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5434 and the cdr of that element is non-nil. |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5435 If PROPVAL is a list, check each element of PROPVAL in that way, |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5436 and the first time some element is found, |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5437 return 1 if the cdr of that element is non-nil. |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5438 Otherwise return 0. |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5439 This function cannot quit. */ |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5440 |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5441 int |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5442 invisible_ellipsis_p (propval, list) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5443 register Lisp_Object propval; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5444 Lisp_Object list; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5445 { |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5446 register Lisp_Object tail, proptail; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5447 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5448 { |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5449 register Lisp_Object tem; |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5450 tem = XCONS (tail)->car; |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5451 if (CONSP (tem) && EQ (propval, XCONS (tem)->car)) |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5452 return ! NILP (XCONS (tem)->cdr); |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5453 } |
|
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5454 if (CONSP (propval)) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5455 for (proptail = propval; CONSP (proptail); |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5456 proptail = XCONS (proptail)->cdr) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5457 { |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5458 Lisp_Object propelt; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5459 propelt = XCONS (proptail)->car; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5460 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5461 { |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5462 register Lisp_Object tem; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5463 tem = XCONS (tail)->car; |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5464 if (CONSP (tem) && EQ (propelt, XCONS (tem)->car)) |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5465 return ! NILP (XCONS (tem)->cdr); |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5466 } |
|
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5467 } |
|
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5468 return 0; |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5469 } |
|
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5470 |
| 277 | 5471 void |
| 5472 syms_of_xdisp () | |
| 5473 { | |
|
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5474 staticpro (&Qinhibit_redisplay); |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5475 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5476 |
|
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5477 staticpro (&Qmenu_bar_update_hook); |
|
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5478 Qmenu_bar_update_hook = intern ("menu-bar-update-hook"); |
|
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5479 |
|
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
5480 staticpro (&Qoverriding_terminal_local_map); |
| 12267 | 5481 Qoverriding_terminal_local_map = intern ("overriding-terminal-local-map"); |
|
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
5482 |
|
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5483 staticpro (&Qoverriding_local_map); |
|
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5484 Qoverriding_local_map = intern ("overriding-local-map"); |
|
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5485 |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5486 staticpro (&Qwindow_scroll_functions); |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5487 Qwindow_scroll_functions = intern ("window-scroll-functions"); |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5488 |
|
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5489 staticpro (&Qredisplay_end_trigger_functions); |
|
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5490 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
|
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
5491 |
|
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5492 staticpro (&Qinhibit_point_motion_hooks); |
|
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5493 Qinhibit_point_motion_hooks = intern ("inhibit-point-motion-hooks"); |
|
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5494 |
| 277 | 5495 staticpro (&last_arrow_position); |
| 5496 staticpro (&last_arrow_string); | |
| 5497 last_arrow_position = Qnil; | |
| 5498 last_arrow_string = Qnil; | |
| 5499 | |
|
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5500 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5501 "Non-nil means don't actually do any redisplay.\n\ |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5502 This is used for internal purposes."); |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5503 Vinhibit_redisplay = Qnil; |
|
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5504 |
| 277 | 5505 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
|
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
5506 "String (or mode line construct) included (normally) in `mode-line-format'."); |
| 277 | 5507 Vglobal_mode_string = Qnil; |
| 5508 | |
| 5509 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
| 5510 "Marker for where to display an arrow on top of the buffer text.\n\ | |
| 5511 This must be the beginning of a line in order to work.\n\ | |
| 5512 See also `overlay-arrow-string'."); | |
| 5513 Voverlay_arrow_position = Qnil; | |
| 5514 | |
| 5515 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
| 5516 "String to display as an arrow. See also `overlay-arrow-position'."); | |
| 5517 Voverlay_arrow_string = Qnil; | |
| 5518 | |
| 5519 DEFVAR_INT ("scroll-step", &scroll_step, | |
| 5520 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
| 769 | 5521 If that fails to bring point back on frame, point is centered instead.\n\ |
| 5522 If this is zero, point is always centered after it moves off frame."); | |
| 277 | 5523 |
|
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5524 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5525 "*Scroll up to this many lines, to bring point back on screen."); |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5526 scroll_conservatively = 0; |
|
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5527 |
|
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5528 DEFVAR_INT ("scroll-margin", &scroll_margin, |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5529 "*Number of lines of margin at the top and bottom of a window.\n\ |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5530 Recenter the window whenever point gets within this many lines\n\ |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5531 of the top or bottom of the window."); |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5532 scroll_margin = 0; |
|
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5533 |
| 277 | 5534 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
| 5535 | |
| 5536 DEFVAR_BOOL ("truncate-partial-width-windows", | |
| 5537 &truncate_partial_width_windows, | |
| 769 | 5538 "*Non-nil means truncate lines in all windows less than full frame wide."); |
| 277 | 5539 truncate_partial_width_windows = 1; |
| 5540 | |
| 5541 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
| 5542 "*Non-nil means use inverse video for the mode line."); | |
| 5543 mode_line_inverse_video = 1; | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5544 |
|
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5545 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
| 20997 | 5546 "*Maximum buffer size (in characters) for line number display\n\ |
| 5547 If the buffer is bigger than this, the line number does not appear\n\ | |
| 5548 in the mode line.."); | |
|
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5549 line_number_display_limit = 1000000; |
|
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5550 |
|
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5551 DEFVAR_BOOL ("highlight-nonselected-windows", &highlight_nonselected_windows, |
|
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5552 "*Non-nil means highlight region even in nonselected windows."); |
|
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
5553 highlight_nonselected_windows = 0; |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5554 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5555 DEFVAR_BOOL ("multiple-frames", &multiple_frames, |
|
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
5556 "Non-nil if more than one frame is visible on this display.\n\ |
|
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
5557 Minibuffer-only frames don't count, but iconified frames do.\n\ |
|
12684
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
5558 This variable is not guaranteed to be accurate except while processing\n\ |
|
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
5559 `frame-title-format' and `icon-title-format'."); |
|
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5560 |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5561 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5562 "Template for displaying the titlebar of visible frames.\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5563 \(Assuming the window manager supports this feature.)\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5564 This variable has the same structure as `mode-line-format' (which see),\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5565 and is used only on frames for which no explicit name has been set\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5566 \(see `modify-frame-parameters')."); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5567 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5568 "Template for displaying the titlebar of an iconified frame.\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5569 \(Assuming the window manager supports this feature.)\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5570 This variable has the same structure as `mode-line-format' (which see),\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5571 and is used only on frames for which no explicit name has been set\n\ |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5572 \(see `modify-frame-parameters')."); |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5573 Vicon_title_format |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5574 = Vframe_title_format |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5575 = Fcons (intern ("multiple-frames"), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5576 Fcons (build_string ("%b"), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5577 Fcons (Fcons (build_string (""), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5578 Fcons (intern ("invocation-name"), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5579 Fcons (build_string ("@"), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5580 Fcons (intern ("system-name"), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5581 Qnil)))), |
|
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5582 Qnil))); |
| 10393 | 5583 |
| 5584 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
| 5585 "Maximum number of lines to keep in the message log buffer.\n\ | |
| 5586 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
| 5587 the buffer when it becomes large."); | |
| 5588 XSETFASTINT (Vmessage_log_max, 50); | |
|
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5589 |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5590 DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions, |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5591 "Functions called before redisplay, if window sizes have changed.\n\ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5592 The value should be a list of functions that take one argument.\n\ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5593 Just before redisplay, for each frame, if any of its windows have changed\n\ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5594 size since the last redisplay, or have been split or deleted,\n\ |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5595 all the functions in the list are called, with the frame as argument."); |
|
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5596 Vwindow_size_change_functions = Qnil; |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5597 |
|
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5598 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
|
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5599 "List of functions to call before redisplaying a window with scrolling.\n\ |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5600 Each function is called with two arguments, the window\n\ |
|
13196
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
5601 and its new display-start position. Note that the value of `window-end'\n\ |
|
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
5602 is not valid when these functions are called."); |
|
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5603 Vwindow_scroll_functions = Qnil; |
|
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5604 |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5605 DEFVAR_INT ("minibuffer-scroll-overlap", &minibuffer_scroll_overlap, |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5606 "*Number of characters of overlap when scrolling a one-line window.\n\ |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5607 This commonly affects the minibuffer window, hence the name of the variable."); |
|
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5608 minibuffer_scroll_overlap = 20; |
|
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5609 |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5610 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5611 &unibyte_display_via_language_environment, |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5612 "*Non-nil means display unibyte text according to language environment.\n\ |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5613 Specifically this means that unibyte non-ASCII characters\n\ |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5614 are displayed by converting them to the equivalent multibyte characters\n\ |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5615 according to the current language environment. As a result, they are\n\ |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5616 displayed according to the current fontset."); |
|
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
5617 unibyte_display_via_language_environment = 0; |
| 277 | 5618 } |
| 5619 | |
| 5620 /* initialize the window system */ | |
| 21514 | 5621 void |
| 277 | 5622 init_xdisp () |
| 5623 { | |
| 5624 Lisp_Object root_window; | |
| 5625 #ifndef COMPILER_REGISTER_BUG | |
| 5626 register | |
| 5627 #endif /* COMPILER_REGISTER_BUG */ | |
| 5628 struct window *mini_w; | |
| 5629 | |
| 5630 this_line_bufpos = 0; | |
| 5631 | |
| 5632 mini_w = XWINDOW (minibuf_window); | |
|
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
5633 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
| 277 | 5634 |
| 5635 echo_area_glyphs = 0; | |
| 5636 previous_echo_glyphs = 0; | |
| 5637 | |
| 5638 if (!noninteractive) | |
| 5639 { | |
| 769 | 5640 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
|
18458
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5641 XSETFASTINT (XWINDOW (root_window)->top, FRAME_MENU_BAR_LINES (f)); |
|
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5642 set_window_height (root_window, |
|
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5643 FRAME_HEIGHT (f) - 1 - FRAME_MENU_BAR_LINES (f), |
|
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5644 0); |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5645 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
| 277 | 5646 set_window_height (minibuf_window, 1, 0); |
| 5647 | |
|
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5648 XSETFASTINT (XWINDOW (root_window)->width, FRAME_WIDTH (f)); |
|
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5649 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
| 277 | 5650 } |
| 5651 } |
