annotate src/xdisp.c @ 18636:b3f3cd32fa70

(Fsignal, find_handler_clause): If ERROR_SYMBOL is nil, assume it's in the car of DATA.
author Richard M. Stallman <rms@gnu.org>
date Sat, 05 Jul 1997 19:58:21 +0000
parents 92d4f44969c6
children 8873a10882dc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Display generation from window structure and buffer text.
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4 This file is part of GNU Emacs.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 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
8 the Free Software Foundation; either version 2, or (at your option)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 any later version.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU General Public License for more details.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 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
18 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
19 Boston, MA 02111-1307, USA. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4423
diff changeset
22 #include <config.h>
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include <stdio.h>
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 /*#include <ctype.h>*/
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #undef NULL
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "lisp.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
27 #include "frame.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "window.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "termchar.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "dispextern.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "buffer.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
32 #include "charset.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "indent.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #include "commands.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #include "macros.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 #include "disptab.h"
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
37 #include "termhooks.h"
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
38 #include "intervals.h"
12081
0d7b62a295be Include keyboard.h.
Karl Heuer <kwzh@gnu.org>
parents: 12022
diff changeset
39 #include "keyboard.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
40 #include "coding.h"
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
41 #include "process.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
43 #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
44 extern void set_frame_menubar ();
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
45 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
46 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
47
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
51 extern int minibuffer_auto_raise;
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
52
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
53 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
54
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
55 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
56 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
57
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
58 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
59 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
60 Lisp_Object Qredisplay_end_trigger_functions;
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
61
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
62 /* Nonzero means print newline to stdout before next minibuffer message. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
66 /* 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
67
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
68 static int message_log_need_newline;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
69
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 #define min(a, b) ((a) < (b) ? (a) : (b))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71 #define max(a, b) ((a) > (b) ? (a) : (b))
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
72 #define minmax(floor, val, ceil) \
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
73 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75 /* The buffer position of the first character appearing
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
76 entirely or partially on the current frame line.
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
77 Or zero, which disables the optimization for the current frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
78 static int this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
79
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80 /* Number of characters past the end of this line,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 including the terminating newline */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82 static int this_line_endpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
83
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
84 /* The vertical position of this frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85 static int this_line_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
87 /* Hpos value for start of display on this frame line.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 Usually zero, but negative if first character really began
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 on previous line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 static int this_line_start_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 /* Buffer that this_line variables are describing. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95 /* Value of echo_area_glyphs when it was last acted on.
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
96 If this is nonzero, there is a message on the frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 in the minibuffer and it should be erased as soon
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 as it is no longer requested to appear. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 char *previous_echo_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
101 /* Nonzero means truncate lines in all windows less wide than the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
104 /* 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
105 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
106 int multiple_frames;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
107
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 /* Marker for where to display an arrow on top of the buffer text. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 /* String to display for the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
116 /* 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
117 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
118
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
119 /* 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
120 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
121
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
122 /* 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
123 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
124 have changed. */
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
125 static Lisp_Object Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
126
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 /* Values of those variables at last redisplay. */
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
128 static Lisp_Object last_arrow_position, last_arrow_string;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
130 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
131
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 /* Nonzero if overlay arrow has been displayed once in this window. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
135 /* 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
136 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
137 strings that get displayed there.) */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
138 static int zv_strings_seen;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
139
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
140 /* 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
141 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
142
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
143 /* If cursor motion alone moves point off frame,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 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
145 static int scroll_step;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
147 /* 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
148 when appropriate. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
149 static int scroll_conservatively;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
150
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
151 /* 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
152 of the top or bottom of the window. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
153 int scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
154
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 /* Nonzero if try_window_id has made blank lines at window bottom
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 since the last redisplay that paused */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 static int blank_end_of_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
159 /* 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
160 (or another buffer with the same base buffer).
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161 keyboard.c refers to this. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
163
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
164 /* display_text_line sets these to the frame position (origin 0) of point,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 whether the window is selected or not.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 Set one to -1 first to determine whether point was found afterwards. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 static int cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 static int cursor_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
171 static int debug_end_pos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 /* Nonzero means display mode line highlighted */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
176 static void redisplay_internal ();
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
177 static int message_log_check_duplicate ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 static void echo_area_display ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 void mark_window_display_accurate ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 static void redisplay_windows ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 static void redisplay_window ();
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
182 static void update_menu_bar ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 static void try_window ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 static int try_window_id ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 static struct position *display_text_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 static void display_mode_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 static int display_mode_element ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188 static char *decode_mode_spec ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 static int display_string ();
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
190 static void display_menu_bar ();
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
191 static int display_count_lines ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 /* 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
194 Lisp_Object minibuf_prompt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 /* Width in columns of current minibuffer prompt. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 int minibuf_prompt_width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 /* Message to display instead of minibuffer contents
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 This is what the functions error and message make,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 and command echoing uses it as well.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 It overrides the minibuf_prompt as well as the buffer. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 char *echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
205 /* 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
206 int echo_area_glyphs_length;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
207
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
208 /* 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
209 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
210 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
211 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
212
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 /* true iff we should redraw the mode lines on the next redisplay */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 /* Smallest number of characters before the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 int beg_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 /* Smallest number of characters after the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 int end_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 /* 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
227 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
228 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 contain no useful information */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 int unchanged_modified;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
232 /* 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
233 int overlay_unchanged_modified;
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
234
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 /* Nonzero if window sizes or contents have changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 since last redisplay that finished */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
239 /* 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
240 and it displayed a line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
241 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
242
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
243 /* 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
244 static int line_number_display_limit;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
245
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
246 /* Number of lines to keep in the message log buffer.
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
247 t means infinite. nil means don't log at all. */
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
248 Lisp_Object Vmessage_log_max;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
250 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
251
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
252 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
253 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
254 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
255 if (message_log_need_newline)
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
256 message_dolog ("", 0, 1);
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
257 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
258
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
259
10442
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
260 /* 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
261 This function calls low-level routines in order to bypass text property
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
262 hooks, etc. which might not be safe to run. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
263
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
264 void
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
265 message_dolog (m, len, nlflag)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
266 char *m;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
267 int len, nlflag;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
268 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
269 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
270 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
271 struct buffer *oldbuf;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
272 int oldpoint, oldbegv, oldzv;
13733
e51b69e60614 (message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 13655
diff changeset
273 int old_windows_or_buffers_changed = windows_or_buffers_changed;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
274
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
275 oldbuf = current_buffer;
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
276 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
277 current_buffer->undo_list = Qt;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
278 oldpoint = PT;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
279 oldbegv = BEGV;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
280 oldzv = ZV;
10442
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
281 BEGV = BEG;
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
282 ZV = Z;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
283 if (oldpoint == Z)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
284 oldpoint += len + nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
285 if (oldzv == Z)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
286 oldzv += len + nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
287 TEMP_SET_PT (Z);
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
288 if (len)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
289 insert_1 (m, len, 1, 0);
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
290 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
291 {
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
292 int this_bol, prev_bol, dup;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
293 insert_1 ("\n", 1, 1, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
294
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
295 this_bol = scan_buffer ('\n', Z, 0, -2, 0, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
296 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
297 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
298 prev_bol = scan_buffer ('\n', this_bol, 0, -2, 0, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
299 dup = message_log_check_duplicate (prev_bol, this_bol);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
300 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
301 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
302 if (oldpoint > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
303 oldpoint -= min (this_bol, oldpoint) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
304 if (oldbegv > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
305 oldbegv -= min (this_bol, oldbegv) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
306 if (oldzv > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
307 oldzv -= min (this_bol, oldzv) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
308 del_range_1 (prev_bol, this_bol, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
309 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
310 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
311 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
312 int duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
313
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
314 /* 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
315 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
316 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
317 duplen = strlen (dupstr);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
318 TEMP_SET_PT (Z-1);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
319 if (oldpoint == Z)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
320 oldpoint += duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
321 if (oldzv == Z)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
322 oldzv += duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
323 insert_1 (dupstr, duplen, 1, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
324 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
325 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
326 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
327
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
328 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
329 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
330 int pos = scan_buffer ('\n', Z, 0,
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
331 -XFASTINT (Vmessage_log_max) - 1, 0, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
332 oldpoint -= min (pos, oldpoint) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
333 oldbegv -= min (pos, oldbegv) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
334 oldzv -= min (pos, oldzv) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
335 del_range_1 (BEG, pos, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
336 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
337 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
338 BEGV = oldbegv;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
339 ZV = oldzv;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
340 TEMP_SET_PT (oldpoint);
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
341 set_buffer_internal (oldbuf);
13733
e51b69e60614 (message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 13655
diff changeset
342 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
343 message_log_need_newline = !nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
344 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
345 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
346
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
347 /* 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
348 (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
349 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
350 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
351 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
352
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
353 static int
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
354 message_log_check_duplicate (prev_bol, this_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
355 int prev_bol, this_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
356 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
357 int i;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
358 int len = Z - 1 - this_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
359 int seen_dots = 0;
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
360 unsigned char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol);
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
361 unsigned char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
362
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
363 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
364 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
365 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
366 && p1[i] != '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
367 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
368 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
369 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
370 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
371 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
372 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
373 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
374 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
375 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
376 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
377 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
378 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
379 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
380 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
381 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
382 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
383 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
384
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
385 /* 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
386 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
387 existing message, and let the minibuffer text show through.
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
388
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
389 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
390 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
391
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
392 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
393 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
394
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
395 void
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
396 message2 (m, len)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
397 char *m;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
398 int len;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
399 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
400 /* 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
401 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
402 if (m)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
403 message_dolog (m, len, 1);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
404 message2_nolog (m, len);
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
405 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
406
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
407
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
408 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
409
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
410 void
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
411 message2_nolog (m, len)
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
412 char *m;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
413 int len;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
414 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
415 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
416 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
417 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
418 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
419 noninteractive_need_newline = 0;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
420 fwrite (m, len, 1, stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
421 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
422 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
423 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
424 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
425 /* 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
426 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
427 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
428 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
429 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
430 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
431 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
432
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
433 /* 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
434 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
435 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
436 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
437
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
438 FRAME_SAMPLE_VISIBILITY (f);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
439 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
440 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
441 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
442
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
443 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
444 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
445 echo_area_glyphs = m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
446 echo_area_glyphs_length = len;
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
447
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
448 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
449 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
450 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
451 else
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
452 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
453
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
454 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
455 echo_area_display ();
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
456 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
457 do_pending_window_change ();
6661
a26e7181f36b (display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents: 6650
diff changeset
458 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
459 (*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
460 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
461 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
462
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
463 /* Display a null-terminated echo area message M. If M is 0, clear out any
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
464 existing message, and let the minibuffer text show through.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
466 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
467 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
468
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
469 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
470 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
471
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
472 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
473 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
474 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
475 {
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
476 message2 (m, (m ? strlen (m) : 0));
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
477 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
478
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
479 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
480 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
481 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
482 {
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
483 message2_nolog (m, (m ? strlen (m) : 0));
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
484 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
485
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
486 /* 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
487 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
488
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
489 void
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
490 truncate_echo_area (len)
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
491 int len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
492 {
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
493 /* 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
494 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
495 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
496 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
497 echo_area_glyphs_length = len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
498 }
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
499
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
500 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print;
331
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
501 zero if being used by message. */
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
502 int message_buf_print;
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
503
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
504 /* 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
505 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
506
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
511 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
513 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
515 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
516 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
517 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
518 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
519 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
520 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
521 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
522 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
523 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
524 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
526 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 {
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
528 /* 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
529 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
530 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
531 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
532 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
533
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
534 /* 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
535 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
536 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
537 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
539 /* 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
540 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
541 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
542 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
543 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
544 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
545 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
546 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
547 #ifdef NO_ARG_ARRAY
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
548 EMACS_INT a[3];
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
549 a[0] = a1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
550 a[1] = a2;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
551 a[2] = a3;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
552
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
553 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
554 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
555 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
556 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
557 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, &a1);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
558 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
559
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
560 message2 (FRAME_MESSAGE_BUF (f), len);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
561 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
562 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
563 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
564
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
565 /* 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
566 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
567 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
568 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
572 /* The non-logging version of message. */
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
573 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
574 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
575 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
576 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
577 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
578 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
579 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
580 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
581 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
582 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
583 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
584
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
585 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
586 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
587 {
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
588 message2 (echo_area_glyphs, echo_area_glyphs_length);
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
589 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
590
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
591 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
592 echo_area_display ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 register int vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
595 FRAME_PTR f;
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
596 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
597
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
598 /* 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
599 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
600 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
601 /* 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
602 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
603
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
604 if (! FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
607 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
609 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
610 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
611 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
613 if (echo_area_glyphs || minibuf_level == 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
614 {
16266
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
615 int i;
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
616
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
617 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
618
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
619 vpos = XFASTINT (XWINDOW (mini_window)->top);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
620 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
621
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
622 /* 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
623 are always clear. */
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
624 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
625 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
626
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
627 display_string (XWINDOW (mini_window), vpos,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
628 echo_area_glyphs ? echo_area_glyphs : "",
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
629 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
630 FRAME_LEFT_SCROLL_BAR_WIDTH (f),
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
631 0, 0, 0, FRAME_WIDTH (f));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
633 #if 0 /* This just gets in the way. update_frame does the job. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
634 /* 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
635 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
636 FRAME_CURSOR_Y (f) = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
637 if (FRAME_CURSOR_Y (f) == vpos)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
638 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
639 #endif
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
640
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
641 /* Fill the rest of the minibuffer window with blank lines. */
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
642 {
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
643 int i;
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
644
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
645 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
646 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
647 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
648 get_display_line (f, i, 0);
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
649 display_string (XWINDOW (mini_window), vpos,
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
650 "", 0,
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
651 FRAME_LEFT_SCROLL_BAR_WIDTH (f),
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
652 0, 0, 0, FRAME_WIDTH (f));
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
653 }
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
654 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
655 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
656 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
657 windows_or_buffers_changed++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
658
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
659 if (EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
661
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
662 previous_echo_glyphs = echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
663 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
664
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
665 /* 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
666
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
667 #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
668 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
669 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
670
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
671 static int
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
672 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
673 char *str;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
674 int mincol, maxcol;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
675 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
676 char *limit;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
677 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
678 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
679 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
680 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
681 *frame_title_ptr++ = *str++;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
682 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
683 *frame_title_ptr++ = ' ';
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
684 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
685 }
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
686
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
687 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
688 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
689 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
690 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
691 Lisp_Object fmt;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
692 struct buffer *obuf;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
693 int len;
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
694 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
695
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
696 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
697 return;
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
698
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
699 /* 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
700 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
701 Lisp_Object tail;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
702
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
703 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
704 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
705 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
706
11948
19ebc17d1288 (x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents: 11920
diff changeset
707 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
708 && !FRAME_MINIBUF_ONLY_P (tf)
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
709 && (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
710 break;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
711 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
712
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
713 multiple_frames = CONSP (tail);
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
714 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
715
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
716 obuf = current_buffer;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
717 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
718 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
719 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
720 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
721 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
722 frame_title_ptr = 0;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
723 set_buffer_internal (obuf);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
724 /* 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
725 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
726 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
727 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
728 level than this.) */
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
729 if (! STRINGP (f->name) || XSTRING (f->name)->size != len
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
730 || 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
731 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
732 }
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
733 #else
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
734 #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
735 #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
736 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
738 /* Prepare for redisplay by updating menu-bar item lists when appropriate.
11499
24ae4a1359b8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 11444
diff changeset
739 This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
740
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
741 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
742 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
743 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
744 register struct window *w = XWINDOW (selected_window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
745 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
746 struct gcpro gcpro1, gcpro2;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
747
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
748 all_windows = (update_mode_lines || buffer_shared > 1
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
749 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
750
11920
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
751 /* 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
752 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
753 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
754
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
755 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
756 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
757 "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
758 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
759 has yet been specified."
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
760 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
761 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
762 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
763 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
764 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
765
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
766 FOR_EACH_FRAME (tail, frame)
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
767 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
768 || FRAME_ICONIFIED_P (XFRAME (frame)))
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
769 x_consider_frame_title (frame);
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
770 }
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
771 #endif
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
772
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
773 /* Update the menu bar item lists, if appropriate.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
774 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
775 or generation of display lines. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
776 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
777 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
778 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
779 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
780
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
781 record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
782
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
783 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
784 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
785 /* 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
786 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
787 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
788 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
789 Lisp_Object functions;
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
790 /* 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
791 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
792 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
793 GCPRO2 (tail, functions);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
794 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
795 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
796 call1 (XCONS (functions)->car, frame);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
797 functions = XCONS (functions)->cdr;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
798 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
799 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
800 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
801 GCPRO1 (tail);
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
802 update_menu_bar (XFRAME (frame), 0);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
803 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
804 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
805
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
806 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
807 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
808 else
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
809 update_menu_bar (selected_frame, 1);
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
810
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
811 /* 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
812 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
813 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
814 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
815 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
816 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
817
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
818 /* Do a frame update, taking possible shortcuts into account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
819 This is the main external entry point for redisplay.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
820
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
821 If the last redisplay displayed an echo area message and that
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
822 message is no longer requested, we clear the echo area
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
823 or bring back the minibuffer if that is in use.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
824
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
825 Do not call eval from within this function.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
826 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
827 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
828 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
829 but can still lose, because this function
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
830 can be called from signal handlers; with alarms set up;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
831 or with synchronous processes running.
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
832
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
833 See Fcall_process; if you called it from here, it could be
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
834 entered recursively. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
836 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
837
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
838 /* 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
839 no more than once ever 1000 redisplays. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
840 static int clear_face_cache_count;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
841
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
842 /* Record the previous terminal frame we displayed. */
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
843 static FRAME_PTR previous_terminal_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
844
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
845 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
846 redisplay ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
847 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
848 redisplay_internal (0);
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
849 }
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
850
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
851 /* 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
852 is not in response to any user action; therefore, we should
14683
21d5ceaa4d23 Commenht change.
Richard M. Stallman <rms@gnu.org>
parents: 14682
diff changeset
853 preserve the echo area. (Actually, our caller does that job.)
21d5ceaa4d23 Commenht change.
Richard M. Stallman <rms@gnu.org>
parents: 14682
diff changeset
854 Perhaps in the future avoid recentering windows
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
855 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
856
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
857 static void
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
858 redisplay_internal (preserve_echo_area)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
859 int preserve_echo_area;
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
860 {
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
861 register struct window *w = XWINDOW (selected_window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 int must_finish = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 int all_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 register int tlbufpos, tlendpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 struct position pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
870
14559
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
871 #ifdef USE_X_TOOLKIT
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
872 if (popup_activated ())
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
873 return;
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
874 #endif
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
875
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
876 if (! FRAME_WINDOW_P (selected_frame)
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
877 && previous_terminal_frame != selected_frame)
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
878 {
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
879 /* 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
880 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
881 windows_or_buffers_changed++;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
882 SET_FRAME_GARBAGED (selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
883 XSETFRAME (Vterminal_frame, selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
884 }
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
885 previous_terminal_frame = selected_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
886
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
887 /* 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
888 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
889 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
890 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
891 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
892 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
893
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
894 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
895 {
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
896 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
897
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
898 /* 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
899 glyphs to display. */
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
900 init_desired_glyphs (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
901 }
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
902 }
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
903
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
904 /* Notice any pending interrupt request to change frame size. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
905 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
906
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
907 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
908 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
909 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
910 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
911 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
912
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
913 prepare_menu_bars ();
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
914
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
915 if (windows_or_buffers_changed)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
916 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
917
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
918 /* 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
919 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
920 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
921 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
922 if (buffer_shared > 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
923 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
924 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
925
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
926 /* If %c is in use, update it if needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
927 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
928 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
929 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
930 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
931 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
932 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
933 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
934 w->update_mode_line = Qt;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
935
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
936 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
937
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
938 all_windows = update_mode_lines || buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 /* If specs for an arrow have changed, do thorough redisplay
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
941 to ensure we remove any arrow that should no longer exist. */
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
942 if (! EQ (Voverlay_arrow_position, last_arrow_position)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
943 || ! EQ (Voverlay_arrow_string, last_arrow_string))
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
944 all_windows = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
945
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
946 /* 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
947 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
948 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
949 again here. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
950 if (echo_area_glyphs || previous_echo_glyphs)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
951 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
952 echo_area_display ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
953 must_finish = 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
954 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
955
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
956 /* 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
957 if (((!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
958 && !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
959 != !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
960 || (!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
961 && !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
962 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
963 this_line_bufpos = -1;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
964
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
965 tlbufpos = this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 tlendpos = this_line_endpos;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
967 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
968 && !current_buffer->clip_changed
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
969 && FRAME_VISIBLE_P (XFRAME (w->frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
970 /* Make sure recorded data applies to current buffer, etc */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 && this_line_buffer == current_buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972 && current_buffer == XBUFFER (w->buffer)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
973 && NILP (w->force_start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
974 /* Point must be on the line that we have info recorded about */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
975 && PT >= tlbufpos
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
976 && PT <= Z - tlendpos
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
977 /* All text outside that line, including its final newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
978 must be unchanged */
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
979 && ((XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
980 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
981 || (beg_unchanged >= tlbufpos - 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
982 && GPT >= tlbufpos
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
983 /* If selective display, can't optimize
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
984 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
985 && ((INTEGERP (current_buffer->selective_display)
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
986 && XINT (current_buffer->selective_display) > 0
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
987 ? (beg_unchanged >= tlbufpos
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
988 && GPT > tlbufpos)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
989 : 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
990 && end_unchanged >= tlendpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
991 && Z - GPT >= tlendpos)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
992 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
993 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 && (tlbufpos == ZV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
995 || FETCH_BYTE (tlbufpos) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 /* Former continuation line has disappeared by becoming empty */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998 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
999 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1000 || MINI_WINDOW_P (w))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1001 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1002 /* 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
1003 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
1004 line 885).
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1005
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1006 For instance, in the following case:
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1007
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1008 -------- Insert --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1009 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
1010 J_I_ ==> J_I_ `^^' are cursors.
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1011 ^^ ^^
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1012 -------- --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1013
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1014 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
1015
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1016 struct position val;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1017 int prevline;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1018
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1019 prevline = find_next_newline (tlbufpos, -1);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1020 val = *compute_motion (prevline, 0,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1021 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
1022 0,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1023 tlbufpos,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1024 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1025 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1026 window_internal_width (w) - 1,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1027 XINT (w->hscroll), 0, w);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1028 if (val.hpos != this_line_start_hpos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1029 goto cancel;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1030
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1031 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1032 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1033 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1034 display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos,
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
1035 pos_tab_offset (w, tlbufpos), 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1036 /* If line contains point, is not continued,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1037 and ends at same distance from eob as before, we win */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1038 if (cursor_vpos >= 0 && this_line_bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1039 && this_line_endpos == tlendpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1040 {
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
1041 /* 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
1042 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
1043 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
1044 < 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
1045 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1046 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
1047 int *charstart_next_line
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1048 = 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
1049 int adjust;
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1050
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1051 if (Z - tlendpos == ZV)
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1052 /* 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
1053 There is no newline to count. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1054 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
1055 else
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1056 /* This line ends in a newline.
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1057 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
1058 text that follows. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1059 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
1060
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1061 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
1062 }
6619
b3631c88ec7e (redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents: 6612
diff changeset
1063
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1064 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070 }
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
1071 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
1072 /* 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
1073 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
1074 && 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
1075 && (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
1076 > FRAME_CURSOR_Y (selected_frame)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078 if (!must_finish)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1080 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 }
11641
748feea0a51a (redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11531
diff changeset
1085 /* 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
1086 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
1087 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
1088 && !NILP (current_buffer->mark_active))
17698
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1089 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1090 || 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
1091 && 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
1092 && !cursor_in_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 pos = *compute_motion (tlbufpos, 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1096 0,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1097 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
1098 window_internal_width (w) - 1,
574
58047bf5d46c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 528
diff changeset
1099 XINT (w->hscroll),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
1100 pos_tab_offset (w, tlbufpos), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 if (pos.vpos < 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1103 int width = window_internal_width (w) - 1;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1104 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
1105 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1106 FRAME_CURSOR_Y (selected_frame) = this_line_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 cancel:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 /* Text changed drastically or point moved off of line */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1114 cancel_line (this_line_vpos, selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1115 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118 all_windows |= buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1119
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1120 clear_face_cache_count++;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1121
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1124 Lisp_Object tail, frame;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1125
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
1126 #ifdef HAVE_FACES
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1127 /* 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
1128 and not too often either. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1129 if (clear_face_cache_count > 1000)
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1130 {
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1131 clear_face_cache ();
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1132 clear_face_cache_count = 0;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1133 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1134 #endif
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1135
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 /* Recompute # windows showing selected buffer.
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1137 This will be incremented each time such a window is displayed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1138 buffer_shared = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1139
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1140 FOR_EACH_FRAME (tail, frame)
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1141 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1142 FRAME_PTR f = XFRAME (frame);
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1143 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
1144 {
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1145
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1146 /* 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
1147 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
1148 if (condemn_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1149 (*condemn_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1150
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1151 if (FRAME_VISIBLE_P (f))
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1152 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
1153
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1154 /* 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
1155 should now go away. */
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1156 if (judge_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1157 (*judge_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1158 }
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1159 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1161 else if (FRAME_VISIBLE_P (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1163 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
1164 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1168 update:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1169 /* Prevent various kinds of signals during display update.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1170 stdio is not robust about handling signals,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1171 which can cause an apparent I/O error. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1172 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173 unrequest_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1174 stop_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1176 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1177 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1178 Lisp_Object tail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1179
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1180 pause = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1181
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1182 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1183 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1184 FRAME_PTR f;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1185
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1186 if (!FRAMEP (XCONS (tail)->car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1187 continue;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1188
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1189 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
1190
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1191 if ((FRAME_WINDOW_P (f) || f == selected_frame)
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
1192 && FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1193 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1194 pause |= update_frame (f, 0, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1195 if (!pause)
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1196 {
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1197 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
1198 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
1199 (*frame_up_to_date_hook) (f);
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1200 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204 else
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1205 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1206 if (FRAME_VISIBLE_P (selected_frame))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1207 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
1208 else
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1209 pause = 0;
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1210
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1211 /* We may have called echo_area_display at the top of this
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1212 function. If the echo area is on another frame, that may
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1213 have put text on a frame other than the selected one, so the
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1214 above call to update_frame would not have caught it. Catch
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1215 it here. */
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1216 {
12792
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1217 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
1218 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
1219
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1220 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
1221 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1222
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1223 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1224 pause |= update_frame (mini_frame, 0, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1225 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1226 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1227
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1228 /* If frame does not match, prevent doing single-line-update next time.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1229 Also, don't forget to check every line to update the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1230 if (pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 this_line_bufpos = 0;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1233 if (!NILP (last_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1238 /* If we pause after scrolling, some lines in current_frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239 may be null, so preserve_other_columns won't be able to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1240 preserve all the vertical-bar separators. So, avoid using it
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1241 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
1242 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 update_mode_lines = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1246 /* Now text on frame agrees with windows, so
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247 put info into the windows for partial redisplay to follow */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1249 if (!pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 register struct buffer *b = XBUFFER (w->buffer);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1253 blank_end_of_window = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1254 unchanged_modified = BUF_MODIFF (b);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1255 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1256 beg_unchanged = BUF_GPT (b) - BUF_BEG (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1257 end_unchanged = BUF_Z (b) - BUF_GPT (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1259 XSETFASTINT (w->last_point, BUF_PT (b));
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1260 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (selected_frame));
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1261 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1262
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1263 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
1264 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1265 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1266 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1267 b->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 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
1269 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
1270 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
1271 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1272 = (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
1273 ? Qt : Qnil);
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1274
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1275 /* 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
1276 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
1277 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
1278 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1279 || 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
1280 && !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
1281 ? 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
1282 : Qnil);
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1283
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1284 w->window_end_valid = w->buffer;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 last_arrow_position = Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286 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
1287 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
1288 verify_charstarts (w);
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1289 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
1290 (*frame_up_to_date_hook) (selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1291 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1292 update_mode_lines = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1293 windows_or_buffers_changed = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1295
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1296 /* Start SIGIO interrupts coming again.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1297 Having them off during the code above
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1298 makes it less likely one will discard output,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1299 but not impossible, since there might be stuff
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1300 in the system buffer here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1301 But it is much hairier to try to do anything about that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1303 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1304 request_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 start_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1307 /* Change frame size now if a change is pending. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 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
1309
7b1a7e4c7694 (redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents: 7473
diff changeset
1310 /* If we just did a pending size change, redisplay again
7b1a7e4c7694 (redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents: 7473
diff changeset
1311 for the new size. */
7757
8d27747de7ca (redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents: 7752
diff changeset
1312 if (windows_or_buffers_changed && !pause)
7752
7b1a7e4c7694 (redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents: 7473
diff changeset
1313 redisplay ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1316 /* Redisplay, but leave alone any recent echo area message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317 unless another message has been requested in its place.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1318
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1319 This is useful in situations where you need to redisplay but no
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1320 user action has occurred, making it inappropriate for the message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1321 area to be cleared. See tracking_off and
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322 wait_reading_process_input for examples of these situations. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1323
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1324 redisplay_preserve_echo_area ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1325 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1326 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1327 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 echo_area_glyphs = previous_echo_glyphs;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1329 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1330 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1331 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1332 else
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1333 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1334 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 mark_window_display_accurate (window, flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1339 int flag;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1340 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1341 register struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1342
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1343 for (;!NILP (window); window = w->next)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1344 {
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1345 if (!WINDOWP (window)) abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1346 w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1347
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1348 if (!NILP (w->buffer))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1349 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1350 XSETFASTINT (w->last_modified,
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1351 !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
1352 XSETFASTINT (w->last_overlay_modified,
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1353 !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
1354 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1355 = (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
1356 ? Qt : Qnil);
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1357
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1358 /* 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
1359 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
1360 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
1361 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1362 || highlight_nonselected_windows)
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1363 && !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
1364 ? 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
1365 : Qnil);
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1366 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1367
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1368 w->window_end_valid = w->buffer;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1369 w->update_mode_line = Qnil;
14263
082e86e9bca3 (mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents: 14206
diff changeset
1370 if (!NILP (w->buffer) && flag)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1371 XBUFFER (w->buffer)->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1372
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1373 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 mark_window_display_accurate (w->vchild, flag);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1375 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 mark_window_display_accurate (w->hchild, flag);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 if (flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1381 last_arrow_position = Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382 last_arrow_string = Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1383 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1384 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1385 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1386 /* t is unequal to any useful value of Voverlay_arrow_... */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1387 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1388 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1392 /* 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
1393 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
1394 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
1395
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1396 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
1397
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1398 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1399 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
1400 FRAME_PTR f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1401 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1402 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1403 struct buffer *old = current_buffer;
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1404 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1405 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
1406
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1407 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1408 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1409
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1410 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1411 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1412
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
1413 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
1414 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
1415 #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
1416 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
1417 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
1418 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
1419 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
1420 : FRAME_MENU_BAR_LINES (f) > 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1421 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1422 /* 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
1423 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
1424 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
1425 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
1426 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
1427 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
1428 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1429 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
1430 || !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
1431 || ((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
1432 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1433 != !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
1434 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
1435 && !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
1436 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1437 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1438 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
1439 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
1440
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
1441 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
1442 if (save_match_data)
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
1443 record_unwind_protect (Fstore_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
1444 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1445 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1446 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1447 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1448 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1449
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1450 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1451 call1 (Vrun_hooks, Qactivate_menubar_hook);
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1452 /* 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
1453 really recompute the menubar from the value. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1454 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1455 call0 (Qrecompute_lucid_menubar);
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
1456 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
1457 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
1458 /* 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
1459 #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
1460 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
1461 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
1462 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1463 /* 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
1464 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
1465 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1466 #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
1467 /* 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
1468 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
1469 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1470 #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
1471
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1472 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
1473 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1474 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1475 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1476 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1477
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1478 int do_id = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1479
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1480 /* Redisplay WINDOW and its subwindows and siblings. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1481
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1483 redisplay_windows (window, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1484 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1485 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1487 for (; !NILP (window); window = XWINDOW (window)->next)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1488 redisplay_window (window, 0, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1491 /* 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
1492 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
1493 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
1494 macro DISP_CHAR_VECTOR. */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1495 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1496 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
1497 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
1498 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1499 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1500 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1501 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1502
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1503 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
1504
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1505 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
1506 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
1507 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1508 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
1509 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
1510 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1511 /* 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
1512 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
1513 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
1514 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
1515 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1516 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1517
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1518 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
1519 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1520 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
1521 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
1522 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
1523 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1524 /* 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
1525 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1526 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1527
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1528 /* Redisplay window WINDOW and its subwindows. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1529
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1530 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1531 redisplay_window (window, just_this_one, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1533 int just_this_one, preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 register struct window *w = XWINDOW (window);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1536 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1537 int height;
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1538 register int lpoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539 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
1540 register int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541 register int startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 register int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 struct position pos;
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1544 int opoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545 int tem;
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1546 int update_mode_line;
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1547 struct Lisp_Char_Table *dp = window_display_table (w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1548
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1549 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1551 /* If this is a combination window, do its children; that's all. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1553 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1554 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1555 redisplay_windows (w->vchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1556 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1557 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1558 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1560 redisplay_windows (w->hchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1561 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1563 if (NILP (w->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 abort ();
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1565
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1566 height = window_internal_height (w);
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1567 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
1568 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
1569 update_mode_line = 1;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1570
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1571 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1572 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1573 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
1574 /* 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
1575 goto finish_scroll_bars;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1576 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1577 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1578 /* 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
1579 so clear it. */
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1580 int vpos = XFASTINT (w->top);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1581 int i;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1582
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1583 for (i = 0; i < height; i++)
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1584 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1585 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
1586 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
1587 FRAME_LEFT_SCROLL_BAR_WIDTH (f),
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1588 0, 1, 0, width);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1589 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1590
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1591 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1592 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1593 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1594
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1595 /* Otherwise set up data on this window; select its buffer and point value */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1596
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1597 if (update_mode_line)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
1598 set_buffer_internal_1 (XBUFFER (w->buffer));
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1599 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1600 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
1601
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1602 opoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1604 /* 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
1605 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1606 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1607 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1608 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1609 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1610 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1611 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1612 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1613
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1614 /* 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
1615 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
1616
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1617 if (!just_this_one)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1618 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1619 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1620 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1621 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
1622 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1623 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1624 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1625 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1626 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1627 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1628 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1629
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1630 /* POINT refers normally to the selected window.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1631 For any other window, set up appropriate value. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1632
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1634 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1635 int new_pt = marker_position (w->pointm);
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1636 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1637 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1638 new_pt = BEGV;
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1639 Fset_marker (w->pointm, make_number (new_pt), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1641 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1643 new_pt = ZV;
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1644 Fset_marker (w->pointm, make_number (new_pt), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1646 /* We don't use SET_PT so that the point-motion hooks don't run. */
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1647 BUF_PT (current_buffer) = new_pt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1649
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1650 /* 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
1651 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
1652 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
1653 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
1654 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
1655 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
1656 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1657 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
1658
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1659 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
1660 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
1661 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1662 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
1663 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
1664 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1665 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
1666 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1667 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1668
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1670 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1671 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1672
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1673 startp = marker_position (w->start);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1674
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1675 /* 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
1676 check whether it can be used. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1677 if (!NILP (w->optional_new_start))
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1678 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1679 w->optional_new_start = Qnil;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1680 /* 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
1681
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1682 pos = *compute_motion (startp, 0,
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1683 (((EQ (window, minibuf_window)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1684 && startp == BEG)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1685 ? minibuf_prompt_width : 0)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1686 + (hscroll ? 1 - hscroll : 0)),
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1687 0,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1688 PT, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1689 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1690 Fpos_visible_in_window_p (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1691 - (1 << (BITS_PER_SHORT - 1)),
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1692 width, hscroll, pos_tab_offset (w, startp), w);
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1693 /* 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
1694 so do so by setting force_start. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1695 if (pos.bufpos == PT)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1696 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1697 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1698
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1699 /* 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
1700 unless the specified location is outside the accessible range. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1701 if (!NILP (w->force_start))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1703 w->force_start = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1704 /* 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
1705 w->base_line_number = Qnil;
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1706 /* 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
1707 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
1708 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1709 /* 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
1710 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
1711 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
1712 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
1713 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1714 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1715 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1716 Lisp_Object temp[3];
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1717
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1718 set_buffer_temp (old);
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
1719 set_buffer_internal_1 (XBUFFER (w->buffer));
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1720 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1721 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
1722 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1723 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1724 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
1725 make_number (startp));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1726 startp = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1727 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1728 }
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1729 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1730 XSETFASTINT (w->last_overlay_modified, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1731 if (startp < BEGV) startp = BEGV;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1732 if (startp > ZV) startp = ZV;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1733 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1735 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1736 /* If point does not appear, move point so it does appear */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1737 pos = *compute_motion (startp, 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1738 (((EQ (window, minibuf_window)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1739 && startp == BEG)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1740 ? minibuf_prompt_width : 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1741 + (hscroll ? 1 - hscroll : 0)),
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1742 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1743 ZV, height / 2,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1744 - (1 << (BITS_PER_SHORT - 1)),
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1745 width, hscroll, pos_tab_offset (w, startp), w);
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1746 BUF_PT (current_buffer) = pos.bufpos;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1747 if (w != XWINDOW (selected_window))
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1748 Fset_marker (w->pointm, make_number (PT), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1749 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1750 {
5340
fcd6e0da3380 (redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents: 5230
diff changeset
1751 if (current_buffer == old)
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1752 lpoint = PT;
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1753 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1754 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1755 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 }
9218
db4473eb2265 (redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents: 9104
diff changeset
1757 /* 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
1758 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
1759 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
1760 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1761 {
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1762 cancel_my_columns (XWINDOW (window));
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1763 try_window (window, startp);
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1764 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1765 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1766 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1767 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1768
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1769 /* 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
1770 and it has not moved off the frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1771
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1772 /* This code is not used for minibuffer for the sake of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1773 the case of redisplaying to replace an echo area message;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1774 since in that case the minibuffer contents per se are usually unchanged.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1775 This code is of no real use in the minibuffer since
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1776 the handling of this_line_bufpos, etc.,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1777 in redisplay handles the same cases. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1778
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1779 if (XFASTINT (w->last_modified) >= MODIFF
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1780 && 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
1781 && 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
1782 && (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
1783 /* 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
1784 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
1785 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
1786 && 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
1787 /* 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
1788 && !(!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
1789 && 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
1790 /* 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
1791 && 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
1792 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1793 && !EQ (window, minibuf_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1794 {
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1795 int this_scroll_margin = scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1796
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1797 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), 0,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1798 PT, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1799 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1800 Fpos_visible_in_window_p (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1801 - (1 << (BITS_PER_SHORT - 1)),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1802 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1803 pos_tab_offset (w, startp), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1804
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1805 /* 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
1806 if (this_scroll_margin < 0)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1807 this_scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1808
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1809 if (XINT (w->height) < 4 * scroll_margin)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1810 this_scroll_margin = XINT (w->height) / 4;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1811
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1812 /* 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
1813 we are ok. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1814 if (pos.vpos < height - this_scroll_margin
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1815 && (pos.vpos >= this_scroll_margin || startp == BEGV))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1817 /* Ok, point is still on frame */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1818 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1819 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1820 /* 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
1821 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1822 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1823 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1824 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825 /* This doesn't do the trick, because if a window to the right of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1826 this one must be redisplayed, this does nothing because there
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1827 is nothing in DesiredFrame yet, and then the other window is
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 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
1829 if (WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 preserve_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1834 /* Don't bother trying redisplay with same start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835 we already know it will lose */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1837 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1839 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
1840 && !(startp <= BEGV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1841 || FETCH_BYTE (startp - 1) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1842 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1843 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 else if (just_this_one && !MINI_WINDOW_P (w)
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1846 && PT >= startp
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847 && 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
1848 /* 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
1849 && ! NILP (w->start_at_line_beg)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 && ! 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
1851 && do_id && !current_buffer->clip_changed
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 && !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
1853 && 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
1854 /* 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
1855 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1856 && !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
1857 /* 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
1858 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
1859 && !(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
1860 && NILP (w->region_showing)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861 && EQ (last_arrow_position, Voverlay_arrow_position)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1862 && EQ (last_arrow_string, Voverlay_arrow_string)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1863 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1864 && tem != -2)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1865 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1866 /* tem > 0 means success. tem == -1 means choose new start.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867 tem == -2 means try again with same start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1868 and nothing but whitespace follows the changed stuff.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1869 tem == 0 means try again with same start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1870 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1871 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1872 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1873 else if (startp >= BEGV && startp <= ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1874 && (startp < ZV
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1875 /* Avoid starting at end of buffer. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1876 #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
1877 It will have to be considered later. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1878 || ! EQ (window, selected_window)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1879 /* Don't do the recentering if redisplay
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1880 is not for no user action. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1881 || preserve_echo_area
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1882 #endif
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1883 || startp == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1884 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1885 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1886 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887 /* Try to redisplay starting at same place as before */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1888 /* If point has not moved off frame, accept the results */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1891 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1892 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1893 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1894 /* 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
1895 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1896 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1897 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1898 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1902 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1903 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
1904 /* 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
1905 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1906 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1907 set_buffer_temp (old);
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
1908 set_buffer_internal_1 (XBUFFER (w->buffer));
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1909 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1910 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1911 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1912
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913 /* Try to scroll by specified few lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1915 if (scroll_conservatively && !current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1916 && startp >= BEGV && startp <= ZV)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1917 {
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1918 int this_scroll_margin = scroll_margin;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1919
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1920 /* 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
1921 if (this_scroll_margin < 0)
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1922 this_scroll_margin = 0;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1923
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1924 if (XINT (w->height) < 4 * scroll_margin)
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1925 this_scroll_margin = XINT (w->height) / 4;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1926
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1927 if (PT >= Z - XFASTINT (w->window_end_pos))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1928 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1929 struct position pos;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1930 pos = *compute_motion (Z - XFASTINT (w->window_end_pos), 0, 0, 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1931 PT, XFASTINT (w->height), 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1932 XFASTINT (w->width), XFASTINT (w->hscroll),
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1933 pos_tab_offset (w, startp), w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1934 if (pos.vpos > scroll_conservatively)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1935 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1936
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1937 pos = *vmotion (startp, pos.vpos + 1 + this_scroll_margin, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1938
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1939 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1940 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1941 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1942 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1943 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1944 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1945 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1946 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1947 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1948 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1949 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1950 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1951 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1952 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1953 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1954 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1955 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1956 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1957 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1958 if (PT < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1959 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1960 struct position pos;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1961 pos = *compute_motion (PT, 0, 0, 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1962 startp, XFASTINT (w->height), 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1963 XFASTINT (w->width), XFASTINT (w->hscroll),
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1964 pos_tab_offset (w, startp), w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1965 if (pos.vpos >= scroll_conservatively)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1966 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1967
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
1968 pos = *vmotion (startp, - pos.vpos - this_scroll_margin, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1969
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1970 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1971 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1972 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1973 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1974 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1975 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1976 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1977 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1978 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1979 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1980 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1981 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1982 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1983 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1984 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1985 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1986 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1987 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1988 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1989 scroll_fail_1: ;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1990 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
1991
13760
7c7cc29b994e (redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents: 13733
diff changeset
1992 if (scroll_step && !current_buffer->clip_changed
7c7cc29b994e (redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents: 13733
diff changeset
1993 && startp >= BEGV && startp <= ZV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1994 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1995 if (PT > startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1996 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1997 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 if (pos.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1999 goto scroll_fail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2002 pos = *vmotion (startp, (PT < startp ? - scroll_step : scroll_step), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2004 if (PT >= pos.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
2006 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2007 {
14988
c833cd83414c (redisplay_window): Move w->start marker before
Richard M. Stallman <rms@gnu.org>
parents: 14683
diff changeset
2008 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2009 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
2010 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2011 pos.bufpos = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2012 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2015 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2016 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2017 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2018 /* 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
2019 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2020 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2021 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2024 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 scroll_fail: ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2026 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2027
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2028 /* Finally, just choose place to start which centers point */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2029
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2030 recenter:
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2031 /* 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
2032 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2033
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2034 pos = *vmotion (PT, - (height / 2), w);
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
2035 /* 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
2036 in case the window-scroll-functions functions get errors. */
14178
4c8fdbefbb58 (redisplay_window): Fix minor bug in Fset_marker call.
Richard M. Stallman <rms@gnu.org>
parents: 14133
diff changeset
2037 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
2038 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2039 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2040 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
2041 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2042 pos.bufpos = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2043 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2044 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2046 startp = marker_position (w->start);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2047 w->start_at_line_beg
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2048 = (startp == BEGV || FETCH_BYTE (startp - 1) == '\n') ? Qt : Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2049
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2050 done:
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2051 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2052 /* 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
2053 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
2054 || (!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
2055 || 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
2056 || (!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
2057 && XFASTINT (w->column_number_displayed) != current_column ()))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2058 && height != XFASTINT (w->height))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2059 display_mode_line (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2060 if (! line_number_displayed
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2061 && ! BUFFERP (w->base_line_pos))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2062 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2063 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2064 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2065 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2066
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2067 /* 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
2068 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
2069 && (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
2070 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
2071 #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
2072 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
2073 #else
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2074 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
2075 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2076 : FRAME_MENU_BAR_LINES (f) > 0)
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2077 && EQ (FRAME_SELECTED_WINDOW (f), window))
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2078 display_menu_bar (w);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2079
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2080 finish_scroll_bars:
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2081 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
2082 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2083 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2084
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2085 /* 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
2086 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
2087 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
2088 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
2089 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2090
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2091 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
2092 if (! MINI_WINDOW_P (w)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2093 || (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
2094 {
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
2095 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2096 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
2097 /* 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
2098 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
2099 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
2100
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2101 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
2102 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
2103 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2104 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2105 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2106
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2107 /* 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
2108 (*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
2109
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2110 /* 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
2111 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
2112 (*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
2113 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2114
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
2115 BUF_PT (current_buffer) = opoint;
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2116 if (update_mode_line)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
2117 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
2118 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2119 set_buffer_temp (old);
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
2120 BUF_PT (current_buffer) = lpoint;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2122
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2123 /* Do full redisplay on one window, starting at position `pos'. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2128 register int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2129 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2130 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2131 register int height = window_internal_height (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2132 register int vpos = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2133 register int last_text_vpos = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2134 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
2135 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2138 /* 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
2139 if (pos < XBUFFER (w->buffer)->begv
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2140 || pos > XBUFFER (w->buffer)->zv)
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2141 abort ();
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2142
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2143 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2144 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2146 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2147 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
2148 val.ovstring_chars_done = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2149 val.tab_offset = pos_tab_offset (w, pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2150
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2151 while (--height >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2152 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2153 val = *display_text_line (w, pos, vpos, 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
2154 val.ovstring_chars_done);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2155 /* 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
2156 in VAL. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2157 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2158 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2159 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2160 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2161 vpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2162 if (pos != val.bufpos)
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2163 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2164 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
2165 #ifdef USE_TEXT_PROPERTIES
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2166 Lisp_Object invis_prop;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2167 invis_prop = Fget_char_property (val.bufpos-1, Qinvisible, window);
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2168 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
2169 #endif
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2170
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2171 last_text_vpos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2172 /* 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
2173 = vpos - (val.vpos
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2174 && (FETCH_BYTE (val.bufpos - 1) != '\n' || invis));
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2175 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2176 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2177 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2178
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2180 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2182 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2183
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2184 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2185 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2186 && Z != pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2187 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2188
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2189 /* 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
2190 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
2191 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2192 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2193 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2194 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2195
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2196 /* Try to redisplay when buffer is modified locally,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2197 computing insert/delete line to preserve text outside
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2198 the bounds of the changes.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2199 Return 1 if successful, 0 if if cannot tell what to do,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2200 or -1 to tell caller to find a new window start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2201 or -2 to tell caller to do normal redisplay with same window start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2202
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2203 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2204 try_window_id (window)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2205 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2206 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2207 int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2208 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2209 register int height = window_internal_height (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2210 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2211 int top = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2212 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
2213 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2214 int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2215 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2216 int did_motion;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2217 register int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2218 register int i, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2219 int last_text_vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2220 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
2221 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
2222 ? 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
2223 : !NILP (current_buffer->selective_display) ? -1 : 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2224
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 struct position val, bp, ep, xp, pp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2226 int scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2227 int delta;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2228 int epto, old_tick;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2229
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2230 if (GPT - BEG < beg_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2231 beg_unchanged = GPT - BEG;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2232 if (Z - GPT < end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2233 end_unchanged = Z - GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2234
5739
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
2235 if (beg_unchanged + BEG < start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2236 return 0; /* Give up if changes go above top of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2238 /* Find position before which nothing is changed. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2239 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
2240 min (ZV, beg_unchanged + BEG), height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2241 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2242 Fpos_visible_in_window_p() (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2243 - (1 << (BITS_PER_SHORT - 1)),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2244 width, hscroll, pos_tab_offset (w, start), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2245 if (bp.vpos >= height)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2246 {
11111
e3022a32d11d (try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents: 11108
diff changeset
2247 if (PT < bp.bufpos)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2248 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
2249 /* 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
2250 We don't need to change the text at all.
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2251 But we need to update window_end_pos to account for
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2252 any change in buffer size. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2253 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
2254 ZV, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2255 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2256 Fpos_visible_in_window_p() (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2257 - (1 << (BITS_PER_SHORT - 1)),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2258 width, hscroll, pos_tab_offset (w, start), w);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2259 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
2260 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
2261 goto findpoint;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2262 }
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2263 return 0;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2264 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2265
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2266 vpos = bp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2267
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2268 /* Find beginning of that frame line. Must display from there. */
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2269 bp = *vmotion (bp.bufpos, 0, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2270
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2271 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2272 val.hpos = lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2273 if (pos < start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2274 return -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2275
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2276 did_motion = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2277 /* If about to start displaying at the beginning of a continuation line,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2278 really start with previous frame line, in case it was not
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2279 continued when last redisplayed */
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2280 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2281 ||
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2282 /* 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
2283 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2285 bp = *vmotion (bp.bufpos, -1, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2286 --vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2287 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2288 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2289 val.tab_offset = bp.tab_offset; /* Update tab offset. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2290
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2291 if (bp.contin && bp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2292 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2293 val.hpos = bp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2294 val.tab_offset = bp.tab_offset + bp.prevhpos - width;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2295 did_motion = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2296 DEC_POS (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2297 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2298
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2299 bp.vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301 /* Find first visible newline after which no more is changed. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2302 tem = find_next_newline (Z - max (end_unchanged, Z - ZV), 1);
5942
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
2303 if (selective > 0)
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
2304 while (tem < ZV - 1 && (indented_beyond_p (tem, selective)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2305 tem = find_next_newline (tem, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2306
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2307 /* Compute the cursor position after that newline. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2308 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
2309 height, - (1 << (BITS_PER_SHORT - 1)),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2310 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2311 /* 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
2312 val.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2314 /* If changes reach past the text available on the frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2315 just display rest of frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2316 if (ep.bufpos > Z - XFASTINT (w->window_end_pos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2317 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2318 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2319 stop_vpos = ep.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2320
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 /* If no newline before ep, the line ep is on includes some changes
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 that must be displayed. Make sure we don't stop before it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323 /* Also, if changes reach all the way until ep.bufpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 it is possible that something was deleted after the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325 newline before it, so the following line must be redrawn. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2326 if (stop_vpos == ep.vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 && (ep.bufpos == BEGV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2328 || FETCH_BYTE (ep.bufpos - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2329 || ep.bufpos == Z - end_unchanged))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2330 stop_vpos = ep.vpos + 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2331
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2334 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336 /* If changes do not reach to bottom of window,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337 figure out how much to scroll the rest of the window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2338 if (stop_vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340 /* 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
2341 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342 Z - XFASTINT (w->window_end_pos),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2343 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2344 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2345 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2346 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2347 width, hscroll, ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2348 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2349
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2350 /* Is everything on frame below the changes whitespace?
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2351 If so, no scrolling is really necessary. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2352 for (i = ep.bufpos; i < xp.bufpos; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2353 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2354 tem = FETCH_BYTE (i);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2355 if (tem != ' ' && tem != '\n' && tem != '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2356 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2357 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2358 if (i == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2359 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2360
9330
28fcacb58a38 (try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9325
diff changeset
2361 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
2362 XFASTINT (w->window_end_vpos) + scroll_amount);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2363
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2364 /* 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
2365 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2366 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2367 if (PT <= xp.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2369 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
2370 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
2371 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2372 /* 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
2373 ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2374 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2375 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2376 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2377 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
2378 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
2379 width, hscroll,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2380 /* 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
2381 xp.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2382 }
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2383 if (pp.bufpos < PT || pp.vpos == height)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2384 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2385 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
2386 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2387 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2388
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2389 if (stop_vpos - scroll_amount >= height
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2390 || ep.bufpos == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2391 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2392 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2393 stop_vpos -= scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2394 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395 /* In this path, we have altered window_end_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2396 and not left it negative.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2397 We must make sure that, in case display is preempted
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2398 before the frame changes to reflect what we do here,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2399 further updates will not come to try_window_id
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2400 and assume the frame and window_end_vpos match. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2401 blank_end_of_window = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2402 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2403 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
2404 {
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
2405 /* 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
2406 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
2407 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
2408 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
2409 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
2410 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
2411 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2412 else if (bp.bufpos == Z - end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2413 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2414 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2415 don't bother scrolling. Can happen if lines are short. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2416 if (scroll_cost (f, bp.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2417 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2418 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2419 > xp.bufpos - bp.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2420 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2421 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2422 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2423 /* If pure deletion, scroll up as many lines as possible.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2424 In common case of killing a line, this can save the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2425 following line from being overwritten by scrolling
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426 and therefore having to be redrawn. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2427 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
2428 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
2429 scroll_amount, bp.bufpos);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2430 if (!tem)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2431 stop_vpos = height;
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2432 else
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2433 {
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2434 /* 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
2435 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
2436 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
2437 (This can happen in a deletion that ends in mid-line.)
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2438 To adjust properly, we need to make things consistent
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2439 at the position ep.
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2440 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
2441 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
2442 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
2443 int oldstart
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2444 = 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
2445 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
2446 ep.bufpos - oldstart);
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2447 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2448 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2449 else if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 don't bother scrolling. Can happen if lines are short. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2454 overestimate of cost of reprinting, since xp.bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2455 would end up below the bottom of the window. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2456 if (scroll_cost (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2457 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2458 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2459 > xp.bufpos - ep.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2460 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2461 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2462 return -2;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2463 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2464 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
2465 scroll_amount, ep.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2466 if (!tem) stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2467 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2468 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2469
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 /* In any case, do not display past bottom of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 if (stop_vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2474 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477 /* Handle case where pos is before w->start --
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2478 can happen if part of line had been clipped and is not clipped now */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2479 if (vpos == 0 && pos < marker_position (w->start))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2480 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 /* Redisplay the lines where the text was changed */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 last_text_vpos = vpos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2484 /* 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
2485 val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2486 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2489 to account for passing the line that that character really starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2490 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2491 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2492 #endif /* 0 */
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2493 old_tick = MODIFF;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2494 while (vpos < stop_vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2495 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2496 val = *display_text_line (w, pos, top + vpos++, 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
2497 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
2498 /* 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
2499 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
2500 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
2501 if (old_tick != MODIFF)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2502 stop_vpos = height;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2503 /* 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
2504 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2505 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2506 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2507 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2508 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2509 if (pos != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2510 last_text_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2511 /* Next line, unless prev line ended in end of buffer with no cr */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2512 = vpos - (val.vpos && FETCH_BYTE (val.bufpos - 1) != '\n');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2514 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2516 /* There are two cases:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2517 1) we have displayed down to the bottom of the window
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2518 2) we have scrolled lines below stop_vpos by scroll_amount */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2520 if (vpos == height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2523 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2524 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2525 val.bufpos++;
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2526 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
2527 XSETFASTINT (w->window_end_pos, Z - val.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2529
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 /* If scrolling made blank lines at window bottom,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2531 redisplay to fill those lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2532 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2533 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 /* Don't consider these lines for general-purpose scrolling.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535 That will save time in the scrolling computation. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2536 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2537 vpos = xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2538 pos = xp.bufpos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2539 val.hpos = xp.hpos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2540 val.tab_offset = xp.tab_offset;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2541 if (pos == ZV)
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2542 { /* Display from next line */
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2543 vpos = height + scroll_amount;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2544 val.hpos = lmargin;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2545 val.tab_offset = 0;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2546 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 else if (xp.contin && xp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2548 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549 val.hpos = xp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2550 val.tab_offset = xp.tab_offset + bp.prevhpos - width;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2551 DEC_POS (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2552 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2553
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 blank_end_of_window = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2555 /* 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
2556 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2557 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2558 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2559 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2560 to account for passing the line that that character starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2561 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2563 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 while (vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2566 val = *display_text_line (w, pos, top + vpos++, val.hpos,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2567 val.tab_offset, val.ovstring_chars_done);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2568 /* 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
2569 offset in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2570 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2571 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2573 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2576
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 /* Here is a case where display_text_line sets cursor_vpos wrong.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 Make it be fixed up, below. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 if (xp.bufpos == ZV
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2580 && xp.bufpos == PT)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2582 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2583
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2584 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 && Z != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2587 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2589 /* Attempt to adjust end-of-text positions to new bottom line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2591 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2592 delta = height - xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2593 if (delta < 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2594 || (delta > 0 && xp.bufpos <= ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2595 || (delta == 0 && xp.hpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2596 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2597 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
2598 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
2599 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
2600 XFASTINT (w->window_end_vpos) + val.vpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2601 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2602 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2603
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2604 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2605
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2606 /* If point was not in a line that was displayed, find it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2607 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2608 {
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2609 findpoint:
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2610 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
2611 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2612 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2613 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2614 1 << (BITS_PER_SHORT - 1),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2615 width, hscroll, pos_tab_offset (w, start), w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2616 /* Admit failure if point is off frame now */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2617 if (val.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2618 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2619 for (vpos = 0; vpos < height; vpos++)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2620 cancel_line (vpos + top, f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2621 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2622 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2623 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
2624 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2625 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2626
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2627 FRAME_CURSOR_X (f) = cursor_hpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2628 FRAME_CURSOR_Y (f) = cursor_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2629
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2630 if (debug_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2631 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2632 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
2633 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
2634 width, hscroll, pos_tab_offset (w, start), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2635 if (val.vpos != XFASTINT (w->window_end_vpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2636 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2637 if (XFASTINT (w->window_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2638 != Z - val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2639 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2640 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2642 return 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2643 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2644
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2645 /* Copy LEN glyphs starting address FROM to the rope TO.
301
2fb0312f83c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 277
diff changeset
2646 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
2647 Value is TO, advanced past the copied data.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2648 F is the frame we are displaying in. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2649
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2650 static GLYPH *
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2651 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
2652 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2653 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
2654 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
2655 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
2656 int len;
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2657 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
2658 {
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2659 int n = len;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2660 register Lisp_Object *fp = from;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2661 /* 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
2662 int last_code = -1;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2663 int last_merged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2664
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
2665 #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
2666 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
2667 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
2668 {
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2669 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
2670 int facecode;
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2671 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
2672
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2673 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
2674 /* 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
2675 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
2676
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2677 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
2678 /* 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
2679 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
2680 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
2681 /* 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
2682 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
2683 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2684 {
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2685 /* 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
2686 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
2687 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
2688 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2689
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2690 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
2691 *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
2692 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2693 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2694 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2695 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2696 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2697 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
2698 {
6741
840862375e93 (copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents: 6740
diff changeset
2699 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
2700 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2701 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2702 }
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2703 return to;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2704 }
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2705
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2706 /* 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
2707 with a displayable computed face code. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2708
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2709 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
2710 fix_glyph (f, glyph, cface)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2711 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2712 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
2713 int cface;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2714 {
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
2715 #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
2716 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
2717 {
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
2718 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
2719 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
2720 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
2721 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2722 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2723 return glyph;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2724 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2725
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2726 /* Display one line of window W, starting at position START in W's buffer.
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2727
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2728 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
2729 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
2730 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
2731 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
2732 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
2733 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
2734 account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2735
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2737
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2738 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
2739 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
2740
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2741 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
2742 the top of the frame, not W.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2743
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 Returns a STRUCT POSITION giving character to start next line with
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2745 and where to display it, including a zero or negative hpos.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2746 The vpos field is not really a vpos; it is 1 unless the line is continued */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2747
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2748 struct position val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2749
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2750 static struct position *
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2751 display_text_line (w, start, vpos, hpos, taboffset, ovstr_done)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2752 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2753 int start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2754 int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2755 int hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2756 int taboffset;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2757 int ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2758 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2759 register int pos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2760 register int c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2761 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2762 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2763 register unsigned char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2764 GLYPH *endp;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2765 register GLYPH *leftmargin;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2766 register GLYPH *p1prev;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2767 register GLYPH *p1start;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2768 int prevpos;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2769 int *charstart;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2770 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2771 int tab_width = XINT (current_buffer->tab_width);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2772 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
2773 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2774 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2775 int lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2776 int invis;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2777 int last_invis_skip = 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2778 Lisp_Object last_invis_prop;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2779 int hscroll = XINT (w->hscroll);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2780 int truncate = (hscroll
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2781 || (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
2782 && !WINDOW_FULL_WIDTH_P (w))
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2783 || !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
2784
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2785 /* 1 if we should highlight the region. */
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2786 int highlight_region
16069
8fe5e69de92a (redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
2787 = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)
17698
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
2788 && (XWINDOW (current_buffer->last_selected_window) == w
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
2789 || highlight_nonselected_windows));
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2790 int region_beg, region_end;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2791
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
2792 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
2793 ? 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
2794 : !NILP (current_buffer->selective_display) ? -1 : 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2795 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
2796 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
2797
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2798 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
2799 /* 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
2800 if it calls for an ellipsis.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2801 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
2802 selective display is enabled--you must check that separately. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2803 int selective_rlen
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2804 = (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
2805 ? 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
2806 : !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
2807 /* 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
2808 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
2809 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
2810 = (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
2811 ? 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
2812 : default_invis_vector);
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2813
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
2814 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
2815 || !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
2816 ? '$' : 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
2817 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
2818 || !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
2819 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2820
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2821 /* If 1, we must handle multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2822 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
2823 /* Length of multibyte form of each character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2824 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2825 /* 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
2826 displayed from right to left. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2827 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
2828 ? 0 : GLYPH_MASK_REV_DIR);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2829
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2830 /* 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
2831 to overlays or text property changes. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2832 int next_face_change;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2833
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2834 /* 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
2835 overlay starts or ends. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2836 int next_boundary;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2837
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2838 /* 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
2839 int current_face = 0;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2840 int i;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2841
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2842 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
2843 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
2844
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
2845 hpos += 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
2846 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
2847 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2848
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2849 /* Show where to highlight the region. */
2965
5314fdcd87bc (display_text_line): Highlight in any frame's sel window.
Richard M. Stallman <rms@gnu.org>
parents: 2929
diff changeset
2850 if (highlight_region && XMARKER (current_buffer->mark)->buffer != 0
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
2851 /* 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
2852 && (highlight_nonselected_windows
3266
1173bc4814da (display_text_line): Really check for just the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3265
diff changeset
2853 || w == XWINDOW (selected_window)))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2854 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2855 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
2856 if (PT < region_beg)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2857 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2858 region_end = region_beg;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2859 region_beg = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2860 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2861 else
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2862 region_end = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2863 w->region_showing = Qt;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2864 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2865 else
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
2866 {
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
2867 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
2868 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
2869 }
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2870
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2871 if (MINI_WINDOW_P (w)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2872 && start == BEG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2873 && vpos == XFASTINT (w->top))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2874 {
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
2875 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
2876 {
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2877 minibuf_prompt_width
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
2878 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data,
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
2879 XSTRING (minibuf_prompt)->size, hpos,
9756
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2880 /* 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
2881 ' ',
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2882 1, -1,
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2883 /* 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
2884 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
2885 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
2886 (XFASTINT (w->width) > 10
87db7dfa4a96 (display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents: 17317
diff changeset
2887 ? XFASTINT (w->width) - 4 : -1))
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2888 - hpos);
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2889 hpos += minibuf_prompt_width;
10641
88afc23d1474 (display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents: 10567
diff changeset
2890 taboffset -= minibuf_prompt_width;
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2891 }
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2892 else
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2893 minibuf_prompt_width = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2894 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2895
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2896 /* 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
2897 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
2898 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
2899 if (hpos < 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2900 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2901 struct position *left_edge
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2902 = compute_motion (pos, vpos, hpos, 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2903 ZV, vpos, 0,
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2904 width, hscroll, taboffset, w);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2905
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2906 /* 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
2907 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
2908 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
2909 the left margin.
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2910
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2911 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
2912 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
2913 the line. If so, back up. */
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2914 if (left_edge->vpos > vpos
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2915 || left_edge->hpos > 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2916 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2917 pos = left_edge->bufpos;
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2918 /* Since this should not be a valid multibyte character, we
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2919 can decrease POS by 1. */
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2920 pos--;
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2921 hpos = left_edge->prevhpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2922 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2923 else
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2924 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2925 pos = left_edge->bufpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2926 hpos = left_edge->hpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2927 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2928 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2929
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2930 desired_glyphs->bufp[vpos] = start;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2931 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
2932 p1start = p1;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2933 charstart = desired_glyphs->charstarts[vpos] + hpos;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2934 /* 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
2935 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
2936 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
2937 endp = leftmargin + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2938
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2939 /* 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
2940 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
2941 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
2942 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
2943 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
2944 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
2945
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2946 /* Loop generating characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2947 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
2948 if reach or pass continuation column,
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2949 or at face change. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2950 pause = pos;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2951 next_face_change = pos;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2952 next_boundary = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2953 p1prev = p1;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2954 prevpos = pos;
6643
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
2955 while (1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2956 {
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2957 if (pos >= pause)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2958 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
2959 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
2960
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2961 while (pos == next_boundary)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2962 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2963 Lisp_Object position, limit, prop, ww;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2964
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2965 /* 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
2966 and have already displayed the appropriate strings
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2967 on an earlier line. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2968 if (pos < ZV || !zv_strings_seen++)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2969 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2970 int ovlen;
16245
d960549d163c (display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 16197
diff changeset
2971 unsigned char *ovstr;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2972 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
2973
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2974 if (ovlen > 0)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2975 {
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2976 /* 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
2977 ovstr += ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2978 ovlen -= ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2979
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2980 while (ovlen > 0)
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2981 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2982 int charset, cols;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2983 GLYPH g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2984
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2985 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2986 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2987 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
2988 ovstr += len, ovlen -= len, ovstr_done += len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2989 charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2990 cols = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2991 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2992 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2993 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2994 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2995 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2996 c = *ovstr++, ovlen--, ovstr_done++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2997 cols = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2998 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2999 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
3000 while (cols-- > 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3001 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3002 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3003 *p1 = g, g |= GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3004 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3005 }
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3006 }
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3007 /* 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
3008 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
3009 just for neatness' sake. */
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3010 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
3011 ovstr_done = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3012 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3013 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3014
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3015 /* Did we reach point? Record the cursor location. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3016 if (pos == PT && cursor_vpos < 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3017 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3018 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3019 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3020 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3021
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3022 if (pos >= ZV)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3023 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3024
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3025 XSETFASTINT (position, pos);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3026 limit = Fnext_overlay_change (position);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3027 #ifdef USE_TEXT_PROPERTIES
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3028 /* This is just an estimate to give reasonable
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3029 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
3030 if (XFASTINT (limit) > pos + 50)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3031 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3032 int limitpos = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3033 if (limitpos < Z)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3034 INC_POS (limitpos); /* Adjust to character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3035 XSETFASTINT (limit, limitpos);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3036 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3037 limit = Fnext_single_property_change (position, Qinvisible,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3038 Fcurrent_buffer (), limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3039 #endif
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3040 next_boundary = XFASTINT (limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3041 /* 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
3042 the next property change. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3043 XSETWINDOW (ww, w);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3044 prop = Fget_char_property (position, Qinvisible, ww);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3045 if (TEXT_PROP_MEANS_INVISIBLE (prop))
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3046 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3047 if (pos < PT && next_boundary >= PT)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3048 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3049 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3050 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3051 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3052 pos = next_boundary;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3053 last_invis_skip = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3054 last_invis_prop = prop;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3055 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3056 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3057
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3058 /* Did we reach point? Record the cursor location. */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3059 if (pos == PT && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3060 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3061 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3062 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3063 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3064
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3065 /* 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
3066 Stop here. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3067 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
3068 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3069 /* 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
3070 /* 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
3071 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
3072 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3073 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
3074 ? leftmargin : p1)
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3075 - p1start];
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3076 *p2x++ = pos;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3077 }
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3078 break;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3079 }
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
3080
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3081 /* 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
3082 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
3083 if (MARKERP (w->redisplay_end_trigger)
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3084 && 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
3085 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
3086 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
3087 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
3088 else
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3089 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
3090
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3091 /* 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
3092 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
3093 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
3094 {
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3095 Lisp_Object args[3];
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3096
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3097 args[0] = Qredisplay_end_trigger_functions;
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3098 XSETWINDOW (args[1], w);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3099 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
3100
7167b8612c52 (display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents: 14036
diff changeset
3101 /* 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
3102 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
3103 w->redisplay_end_trigger = Qnil;
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3104 Frun_hook_with_args (3, args);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3105
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3106 e_t_h = ZV;
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3107 /* 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
3108 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
3109 }
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3110
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3111 #ifdef HAVE_FACES
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3112 /* 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
3113 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
3114 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
3115 if (pos >= next_face_change
91662157e604 (redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents: 15245
diff changeset
3116 && (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
3117 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3118 int limit = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3119
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3120 if (limit < Z && !CHAR_HEAD_P (POS_ADDR (limit)))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3121 INC_POS (limit); /* Adjust to character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3122 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
3123 region_beg, region_end,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3124 &next_face_change, limit, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3125 }
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3126 #endif
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3127
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3128 /* 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
3129 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
3130
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3131 pause = ZV;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3132
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3133 if (pos < next_boundary && next_boundary < pause)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3134 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
3135 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
3136 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
3137
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3138 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
3139 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
3140
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3141 /* 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
3142 the phone? */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3143 if (pos < PT && PT < pause)
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3144 pause = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3145 if (pos < GPT && GPT < pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3146 pause = GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3147
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3148 p = POS_ADDR (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3149 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3150
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3151 if (p1 >= endp)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3152 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3153
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3154 p1prev = p1;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3155
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3156 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3157 /* PAUSE is surely at character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3158 c = STRING_CHAR_AND_LENGTH (p, pause - pos, len), p += len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3159 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3160 c = *p++, len = 1;
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3161 /* 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
3162 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
3163 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3164 p1 = copy_part_of_rope (f, p1, leftmargin,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3165 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3166 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
3167 current_face, rev_dir_bit);
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3168 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3169 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3170 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3171 if (p1 >= leftmargin)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3172 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3173 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3174 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3175 else if (c == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3176 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3177 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3178 /* 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
3179 (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
3180 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
3181 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3182
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3183 invis = 0;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3184 if (last_invis_skip == pos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3185 && 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
3186 invis = 1;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3187 while (pos + 1 < ZV
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3188 && selective > 0
5942
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
3189 && indented_beyond_p (pos + 1, selective))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3190 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191 invis = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3192 pos = find_next_newline (pos + 1, 1);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3193 if (FETCH_BYTE (pos - 1) == '\n')
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3194 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3195 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3196 if (invis && selective_rlen > 0 && p1 >= leftmargin)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3197 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3198 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3199 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
3200
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3201 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
3202 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3203
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3204 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3205 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3206 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
3207
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3208 #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
3209 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
3210 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
3211 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
3212 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
3213 *cs++ = -2;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3214 /* 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
3215 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
3216 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
3217 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3218
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3219 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
3220 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3221 }
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3222
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3223 /* 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
3224 /* 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
3225 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
3226 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3227 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3228 /* 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
3229 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
3230 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
3231 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3232 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3233 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3234 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
3235
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3236 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3237 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3238 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3239 }
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3240 #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
3241 /* 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
3242 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
3243 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
3244 {
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3245 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
3246 p1 = leftmargin;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3247 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
3248 *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
3249 }
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3250 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3251
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3252 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3253 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3254 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3255 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3256 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3257 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3258 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3259 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3260 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3261 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3262 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3263 % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3265 else if (c == Ctl ('M') && selective == -1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 pos = find_next_newline (pos, 1);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3268 if (FETCH_BYTE (pos - 1) == '\n')
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3269 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3270 if (selective_rlen > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3271 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3272 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3273 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3274 p1 = endp;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3275 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
3276 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3277 }
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3278 #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
3279 /* 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
3280 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
3281 if (current_face)
7772
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3282 {
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3283 if (p1 < leftmargin)
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3284 p1 = leftmargin;
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3285 while (p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3286 *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
3287 }
2884
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
3288 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3289
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3290 /* 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
3291 /* 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
3292 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
3293 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3294 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3295 /* 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
3296 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
3297 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
3298 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3299 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3300 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3301 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
3302
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3303 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3304 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3305 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3306 }
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3307 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3308 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3309 else if (c < 0200 && ctl_arrow)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3310 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3311 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
3312 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3313 (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
3314 && 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
3315 ? 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
3316 current_face)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3317 | rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3318 p1++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3319 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3320 *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
3321 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3322 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3323 else if (len == 1)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3324 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3325 /* C is not a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3326 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
3327 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3328 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp))
17362
87db7dfa4a96 (display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents: 17317
diff changeset
3329 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp)))
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3330 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3331 current_face)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3332 | rev_dir_bit);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3333 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3334 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3335 *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face) | rev_dir_bit;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3336 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3337 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3338 *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3339 | rev_dir_bit);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3340 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3341 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3342 *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3343 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3344 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3345 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3346 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3347 /* C is a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3348 int charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3349 int columns = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3350 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3351 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3352 GLYPH 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
3353
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3354 while (columns--)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3355 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3356 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3357 *p1 = g, g |= GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3358 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3359 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3360 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3361
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3362 prevpos = pos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3363 pos += len;
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3364
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3365 /* 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
3366
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3367 /* 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
3368 if (p1 >= leftmargin)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3369 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3370 /* 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
3371 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
3372 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
3373 if (p1 != p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3374 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3375 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3376 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3377 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3378 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
3379
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3380 if (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3381 *p2x++ = prevpos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3382 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3383 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3384 }
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3385 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3386 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3387
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3388 val.hpos = - XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3389 if (val.hpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3390 val.hpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3391
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392 val.vpos = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3393
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 lastpos = pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3396 /* 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
3397 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
3398 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
3399 /* 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
3400 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
3401 internal width. */
7292
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3402 i = p1 - p1start + 1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3403 if (p1 < leftmargin)
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3404 i += leftmargin - p1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3405 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
3406 charstart[i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3407
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3408 /* Handle continuation in middle of a character */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3409 /* by backing up over it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3410 if (p1 > endp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3411 {
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3412 /* 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
3413 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
3414 if (p1prev)
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3415 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3416 /* 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
3417 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
3418 LEN. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3419 pos = prevpos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3420
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3421 if (len == 1)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3422 /* C is not a multi-byte character. We can break it and
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3423 start from the middle column in the next line. So,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3424 adjust VAL.HPOS to skip the columns output on this
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3425 line. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3426 val.hpos += p1prev - endp;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3427 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3428 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3429 /* C is a multibyte character. Since we can't broke it
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3430 in the middle, the whole character should be driven
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3431 into the next line. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3432 /* 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
3433 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
3434 must be adjusted. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3435 taboffset = taboffset + (p1prev - endp);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3436 /* 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
3437 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3438 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
3439 while (p1prev < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3440 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3441 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3442 /* 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
3443 lastpos = pos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3444 if (PT == pos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3445 cursor_vpos = -1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3446 }
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3447 }
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3448
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3449 /* Keep in this line everything up to the continuation column. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3450 p1 = endp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3451 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3452
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3453 /* Finish deciding which character to start the next line on,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3454 and what hpos to start it at.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3455 Also set `lastpos' to the last position which counts as "on this line"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3456 for cursor-positioning. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3457
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3458 if (pos < ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3459 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3460 if (FETCH_BYTE (pos) == '\n')
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3461 {
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3462 /* If stopped due to a newline, start next line after it */
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3463 pos++;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3464 val.tab_offset = 0;
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3465 /* 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
3466 at the right margin. */
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3467 while (pos < ZV && selective > 0
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3468 && indented_beyond_p (pos, selective))
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3469 pos = find_next_newline (pos, 1);
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3470 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3471 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3472 /* Stopped due to right margin of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3473 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3474 if (truncate)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3475 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3476 *p1++ = fix_glyph (f, truncator, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3477 /* Truncating => start next line after next newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3478 and point is on this line if it is before the newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3479 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
3480 do
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3481 pos = find_next_newline (pos, 1);
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3482 while (pos < ZV && selective > 0
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3483 && indented_beyond_p (pos, selective));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3484 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3485
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3486 lastpos = pos - (FETCH_BYTE (pos - 1) == '\n');
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3487 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3488 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3489 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3490 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3491 *p1++ = fix_glyph (f, continuer, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3492 val.vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3493 lastpos--;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3494 val.tab_offset = taboffset + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3495 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3496 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3497 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3498 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3499 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3500
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3501 /* If point is at eol or in invisible text at eol,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3502 record its frame location now. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3503
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3504 if (start <= PT && PT <= lastpos && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3505 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3506 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3507 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3508 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3509
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3510 if (cursor_vpos == vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3511 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3512 if (cursor_hpos < 0) cursor_hpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3513 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
3514 cursor_hpos += WINDOW_LEFT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3515 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3516 {
11649
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3517 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
3518 && 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
3519 {
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3520 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
3521 FRAME_CURSOR_X (f) = cursor_hpos;
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3522 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3523
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3524 if (w == XWINDOW (selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3525 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3526 /* Line is not continued and did not start
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3527 in middle of character */
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3528 if ((hpos - WINDOW_LEFT_MARGIN (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3529 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3530 && val.vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3531 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3532 this_line_bufpos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3533 this_line_buffer = current_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3534 this_line_vpos = cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3535 this_line_start_hpos = hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3536 this_line_endpos = Z - lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3537 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3538 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3539 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3540 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3541 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3542 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3543
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3544 /* If hscroll and line not empty, insert truncation-at-left marker */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3545 if (hscroll && lastpos != start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3546 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3547 GLYPH g = fix_glyph (f, truncator, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3548 *leftmargin = g;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3549 if (p1 <= leftmargin)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3550 p1 = leftmargin + 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3551 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
3552 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3553 p1prev = leftmargin + 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3554 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3555 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3556 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3557 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3558
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3559 if (!WINDOW_RIGHTMOST_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3560 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3561 endp++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3562 if (p1 < leftmargin) p1 = leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3563 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
3564
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
3565 /* 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
3566 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
3567 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
3568 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
3569 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
3570 {
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3571 int i;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3572 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
3573 *p1++ = SPACEGLYPH;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3574 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3575 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
3576 *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
3577 ? XINT (DISP_BORDER_GLYPH (dp))
12921
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3578 : '|');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3579 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3580 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3581 p1 - desired_glyphs->glyphs[vpos]);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3582 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3583
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3584 /* If the start of this line is the overlay arrow-position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3585 then put the arrow string into the display-line. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3586
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3587 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3588 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3589 && 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
3590 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3591 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3592 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3593 unsigned char *p = XSTRING (Voverlay_arrow_string)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3594 int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3595 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
3596 int arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3597
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3598 if (len > width)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3599 len = width;
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3600 #ifdef HAVE_FACES
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
3601 if (!NULL_INTERVAL_P (XSTRING (Voverlay_arrow_string)->intervals))
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3602 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3603 /* If the arrow string has text props, obey them when displaying. */
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3604 for (i = 0; i < len; i++)
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3605 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3606 int c = p[i];
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3607 Lisp_Object face, ilisp;
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3608 int newface;
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3609
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
3610 XSETFASTINT (ilisp, i);
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
3611 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
3612 newface = compute_glyph_face_1 (f, face, 0);
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3613 leftmargin[i] = FAST_MAKE_GLYPH (c, newface);
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3614 }
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3615 }
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3616 else
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3617 #endif /* HAVE_FACES */
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
3618 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3619 for (i = 0; i < len; i++)
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3620 leftmargin[i] = p[i];
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3621 }
3726
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
3622
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
3623 /* 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
3624 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
3625 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
3626 desired_glyphs->used[vpos] = arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3627
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3628 overlay_arrow_seen = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3629 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3630
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3631 val.bufpos = pos;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3632 val.ovstring_chars_done = ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3633 val_display_text_line = val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3634 return &val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3635 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3636
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3637 /* 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
3638
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3639 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3640 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3641 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3642 {
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3643 Lisp_Object items, tail;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3644 register int vpos = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3645 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3646 int maxendcol = FRAME_WIDTH (f);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3647 int hpos = 0;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3648 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3649
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3650 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
3651 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
3652 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3653 #endif
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3654
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3655 #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
3656 if (FRAME_X_P (f))
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3657 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3658 #endif /* USE_X_TOOLKIT */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3659
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3660 get_display_line (f, vpos, 0);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3661
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3662 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
3663 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
3664 {
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3665 Lisp_Object pos, string;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3666 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
3667 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3668 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3669
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
3670 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3671
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3672 if (hpos < maxendcol)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3673 hpos = display_string (XWINDOW (FRAME_ROOT_WINDOW (f)), vpos,
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3674 XSTRING (string)->data,
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3675 XSTRING (string)->size,
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3676 hpos, 0, 0, hpos, maxendcol);
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
3677 /* 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
3678 if (hpos < maxendcol)
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3679 {
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
3680 int hpos1 = hpos + 1;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3681 hpos = display_string (w, vpos, "", 0, hpos, 0, 0,
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3682 min (hpos1, maxendcol), maxendcol);
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3683 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3684 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3685
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3686 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3687 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
3688
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3689 /* 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
3690 if (maxendcol > hpos)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3691 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, maxendcol, maxendcol);
4423
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3692
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3693 /* 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
3694 vpos++;
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3695 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
3696 get_display_line (f, vpos++, 0);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3697 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3698
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3699 /* Display the mode line for window w */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3700
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3701 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3702 display_mode_line (w)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3703 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3704 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3705 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
3706 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
3707 register int right = WINDOW_RIGHT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3708 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3709
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3710 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
3711 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3712
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3713 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
3714
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3715 /* 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
3716 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
3717 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
3718 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
3719
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3720 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
3721 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
3722
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3723 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3724
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3725 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3726
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3727 /* 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
3728 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
3729 partial-width windows and avoid inverting the scroll bar columns. */
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3730 #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
3731 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
3732 {
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3733 /* 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
3734 int i;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3735 unsigned int padding;
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3736 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
3737 for (i = left; i < right; ++i)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3738 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3739 padding = ptr[i] & GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3740 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
3741 }
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3742 }
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
3743 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
3744 #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
3745
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3746 /* 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
3747 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
3748 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
3749 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
3750 (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
3751 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
3752 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
3753 || 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
3754 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3755 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3757 /* Contribute ELT to the mode line for window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758 How it translates into text depends on its data type.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3759
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3760 VPOS is the position of the mode line being displayed.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3761
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3762 HPOS is the position (absolute on frame) where this element's text
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3763 should start. The output is truncated automatically at the right
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3764 edge of window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3765
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3766 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3767 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3768
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3769 MINENDCOL is the hpos before which the element may not end.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3770 The element is padded at the right with spaces if nec
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3771 to reach this column.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3772
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3773 MAXENDCOL is the hpos past which this element may not extend.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3774 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3775 (This is necessary to make nested padding and truncation work.)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3776
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3777 Returns the hpos of the end of the text generated by ELT.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3778 The next element will receive that value as its HPOS arg,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3779 so as to concatenate the elements. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3780
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3781 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3782 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3783 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3784 register int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3785 int depth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3786 int minendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3787 register int maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3788 register Lisp_Object elt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3789 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3790 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3791 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3792 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3793
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3794 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3795
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
3796 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3797 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3798 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3799 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3800 /* A string: output it and check for %-constructs within it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3801 register unsigned char c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3802 register unsigned char *this = XSTRING (elt)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3803
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804 while (hpos < maxendcol && *this)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3805 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3806 unsigned char *last = this;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3807 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3808 ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3809 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3810 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3811 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
3812 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3813 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
3814 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3815 hpos = display_string (w, vpos, last, -1, hpos, 0, 1,
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3816 hpos, min (lim, maxendcol));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3817 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3818 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3819 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3820 register int minendcol;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3821 register int spec_width = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3822
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3823 /* We can't allow -ve args due to the "%-" construct */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3824 /* Argument specifies minwidth but not maxwidth
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3825 (maxwidth can be specified by
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3826 (<negative-number> . <stuff>) mode-line elements) */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828 while ((c = *this++) >= '0' && c <= '9')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3830 spec_width = spec_width * 10 + (c - '0');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3831 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3833 minendcol = hpos + spec_width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3834 if (minendcol > maxendcol)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3835 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3836 spec_width = maxendcol - hpos;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3837 minendcol = maxendcol;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3838 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3839
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3840 if (c == 'M')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3841 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3842 spec_width, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3843 Vglobal_mode_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3844 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
3845 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3846 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
3847 maxendcol - hpos);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3848 if (frame_title_ptr)
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3849 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
3850 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3851 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
3852 hpos, 0, 1,
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3853 minendcol, maxendcol);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3854 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3855 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3856 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3858 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3860 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3861 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3862 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3863 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3864 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3865 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3866 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3867 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3868 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3869 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3870 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3871 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3872 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
3873 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3874 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3875 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3876 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
3877 minendcol, maxendcol);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3878 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3879 hpos = display_string (w, vpos, XSTRING (tem)->data,
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3880 XSTRING (tem)->size,
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3881 hpos, 0, 1, minendcol, maxendcol);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3882 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3883 /* Give up right away for nil or t. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3884 else if (!EQ (tem, elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3885 { elt = tem; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3886 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3887 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3888 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3889
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3890 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3891 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3892 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3894 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3895 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3896 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3897 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3898 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3899 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3900 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3901 according to whether the symbol's value is non-nil or nil. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3902 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
3903 if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3904 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3905 tem = Fboundp (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3906 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
3907 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3908 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3909 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3910 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3911 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3912 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3913 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3914 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3915 { elt = XCONS (elt)->car; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3916 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3917 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3918 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3919 and if possible find the caddr and use that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3920 elt = XCONS (elt)->cdr;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3921 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3922 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3923 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3925 elt = XCONS (elt)->car;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3926 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3927 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3928 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3929 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 register int lim = XINT (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3931 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3932 if (lim < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3933 /* Negative int means reduce maximum width.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3934 DO NOT change MINENDCOL here!
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3935 (20 -10 . foo) should truncate foo to 10 col
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3936 and then pad to 20. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3937 maxendcol = min (maxendcol, hpos - lim);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3938 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3939 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3940 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3941 current maximum. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3942 lim += hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3943 if (lim > maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3944 lim = maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3945 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3946 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3947 that is beyond the current truncation point. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3948 if (lim > minendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3949 minendcol = lim;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3950 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3952 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3953 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3954 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3955 register int limit = 50;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 /* 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
3957 while (CONSP (elt) && --limit > 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3958 && hpos < maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3959 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3960 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3961 hpos, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3962 XCONS (elt)->car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3963 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3964 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3965 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3966 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3967 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3968
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3969 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3970 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3971 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3972 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
3973 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3974 hpos = display_string (w, vpos, "*invalid*", -1, hpos, 0, 1,
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3975 minendcol, maxendcol);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3976 return hpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3977 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3978
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3979 if (minendcol > hpos)
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3980 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3981 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
3982 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3983 hpos = display_string (w, vpos, "", 0, hpos, 0, 1, minendcol, maxendcol);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3984 return hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3985 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3986
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3987 /* 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
3988 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
3989
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3990 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3991 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3992 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3993 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3994 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3995 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3996 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3997
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3998 if (d <= 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3999 *p++ = '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4000 else
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4001 while (d > 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4002 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4003 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4004 d /= 10;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4005 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4006 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
4007 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4008 while (p > buf)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4009 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4010 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4011 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4012 *p-- = d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4013 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4014 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4015
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4016 /* 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
4017 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
4018 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
4019
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4020 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4021 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
4022 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4023 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4024 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4025 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4026 Lisp_Object val;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4027
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4028 val = coding_system;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4029
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4030 if (NILP (val)) /* Not yet decided. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4031 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4032 *buf++ = '-';
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4033 *buf++ = eol_mnemonic_undecided;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4034 /* 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
4035 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4036 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4037 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4038 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4039
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4040 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
4041
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4042 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
4043 {
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4044 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
4045 if (NILP (eolvalue))
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4046 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
4047 }
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4048
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4049 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4050 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4051 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4052 /* The EOL conversion we are using. */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4053 int eoltype;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4054 /* 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
4055
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4056 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
4057 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
4058 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
4059 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
4060 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
4061 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
4062 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4063 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4064 ? eol_mnemonic_dos : eol_mnemonic_mac));
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4065
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4066 /* Mention the EOL conversion if it is not the usual one. */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4067 *buf++ = eoltype;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4068 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4069 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4070 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4071 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4072
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4073 /* 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
4074 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
4075 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
4076 function will later be truncated to width MAXWIDTH. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4077
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
4078 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
4079
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4080 static char *
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4081 decode_mode_spec (w, c, spec_width, maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4082 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4083 register char c;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4084 register int spec_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4085 register int maxwidth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4086 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4087 Lisp_Object obj;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4088 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4089 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
4090 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4091
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4092 obj = Qnil;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4093 if (maxwidth > FRAME_WIDTH (f))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4094 maxwidth = FRAME_WIDTH (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4095
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4096 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4097 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4098 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4099 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
4100 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4101 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
4102 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4103 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4104
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4105 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4106 /* 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
4107 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
4108 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4109 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
4110 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4111 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4112
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4113 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4114 /* 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
4115 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
4116 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4117 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4118
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4119 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4120 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4121
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4122 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4123 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4124 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4125 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4126
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4127 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
4128 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4129 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
4130 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
4131 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4132 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4133 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
4134 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4135
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4136 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4137 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4138 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4139 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4140
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4141 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
4142 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4143 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
4144 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
4145 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4146 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4147 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
4148 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4149
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4150 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4151 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4152 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
4153 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
4154
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4155 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
4156 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
4157 else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4158 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4159 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
4160 *p++ = '-';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4161 *p = '\0';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4162 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4163 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
4164 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4165
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4166 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4167 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4168 #if 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4169 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4170 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4171 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4172 decode_mode_spec_buf[maxwidth - 1] = '\\';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4173 decode_mode_spec_buf[maxwidth] = '\0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4174 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4175 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4176 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4177 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4178
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4179 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4180 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4181 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
4182 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
4183 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
4184 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
4185 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4186
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4187 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4188 /* %F displays the frame name. */
15038
2376256a0204 (decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 15037
diff changeset
4189 if (!NILP (f->title))
2376256a0204 (decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 15037
diff changeset
4190 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
4191 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
4192 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
4193 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
4194
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4195 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4196 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4197 #if 0
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4198 if (NILP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4199 return "[none]";
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4200 else if (STRINGP (obj) && XSTRING (obj)->size > maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4201 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4202 bcopy ("...", decode_mode_spec_buf, 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4203 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4204 decode_mode_spec_buf + 3, maxwidth - 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4205 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4206 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4207 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4208 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4209
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4210 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4211 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4212 int startpos = marker_position (w->start);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4213 int line, linepos, topline;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4214 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4215 Lisp_Object tem;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4216 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4217
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4218 /* 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
4219 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4220 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
4221 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
4222 /* 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
4223 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
4224 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4225
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4226 /* 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
4227 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
4228 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4229 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4230 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4231 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4232 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4233
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4234 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4235 && !NILP (w->base_line_pos)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4236 && XFASTINT (w->base_line_pos) <= marker_position (w->start))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4237 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4238 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4239 linepos = XFASTINT (w->base_line_pos);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4240 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4241 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4242 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4243 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4244 linepos = BUF_BEGV (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4245 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4246
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4247 /* Count lines from base line to window start position. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4248 nlines = display_count_lines (linepos, startpos, startpos, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4249
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4250 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4251
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4252 /* 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
4253 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
4254 "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
4255 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
4256 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4257 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4258 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
4259 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
4260 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4261 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
4262 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4263 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4264 int limit = BUF_BEGV (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4265 int position;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4266 int distance = (height * 2 + 30) * 200;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4267
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4268 if (startpos - distance > limit)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4269 limit = startpos - distance;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4270
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4271 nlines = display_count_lines (startpos, limit,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4272 -(height * 2 + 30),
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4273 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4274 /* 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
4275 200 chars per line,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4276 give up on line numbers for this window. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4277 if (position == startpos - distance)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4278 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4279 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4280 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4281 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4282 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4283
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4284 XSETFASTINT (w->base_line_number, topline - nlines);
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4285 XSETFASTINT (w->base_line_pos, position);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4286 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4287
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4288 /* Now count lines from the start pos to point. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4289 nlines = display_count_lines (startpos, PT, PT, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4290
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4291 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4292 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4293
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4294 /* Make the string to show. */
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4295 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
4296 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4297 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4298 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4299 char* p = decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4300 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
4301 strcpy (p, "??");
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4302 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4303 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4304 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4305 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4306
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4307 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4308 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4309 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4310
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4311 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4312 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4313 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4314 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4315
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4316 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4317 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4318 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
4319 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
4320
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4321 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4322 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4323 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4324 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4325 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4326 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4327 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4328 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4329 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4330 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4331 {
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
4332 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
4333 /* 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
4334 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
4335 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
4336 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4337 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4338 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4339 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4340 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4341 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4342 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4343 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4344 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4345
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4346 /* 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
4347 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4348 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4349 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
4350 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
4351 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
4352
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4353 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4354 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4355 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4356 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4357 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4358 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4359 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4360 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4361 {
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
4362 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
4363 /* 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
4364 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
4365 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
4366 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
4367 /* 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
4368 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
4369 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4370 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4371 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4372 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4373 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4374 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4375 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4376 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4377 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4378
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4379 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4380 /* 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
4381 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
4382 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
4383 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
4384 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4385 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
4386 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4387 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4388
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4389 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
4390 #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
4391 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
4392 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4393 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4394 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4395
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4396 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4397 /* 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
4398 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4399 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4400 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4401 int eol_flag = (c == 'Z');
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4402 char *p;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4403
18184
ef6ecf102af3 (decode_mode_spec): Access the value of
Kenichi Handa <handa@m17n.org>
parents: 17846
diff changeset
4404 p = decode_mode_spec_coding (b->buffer_file_coding_system,
ef6ecf102af3 (decode_mode_spec): Access the value of
Kenichi Handa <handa@m17n.org>
parents: 17846
diff changeset
4405 decode_mode_spec_buf, eol_flag);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4406 if (FRAME_TERMCAP_P (f))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4407 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4408 p = decode_mode_spec_coding (keyboard_coding.symbol, p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4409 p = decode_mode_spec_coding (terminal_coding.symbol, p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4410 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4411 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4412 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4413 if (PROCESSP (obj))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4414 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4415 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
4416 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4417 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
4418 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4419 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4420 #endif /* subprocesses */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4421 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4422 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4423 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4424 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4425
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4426 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4427 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4428 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4429 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4430 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4431
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4432 /* Search for COUNT instances of a line boundary, which means either a
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4433 newline or (if selective display enabled) a carriage return.
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4434 Start at START. If COUNT is negative, search backwards.
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4435
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4436 If we find COUNT instances, set *SHORTAGE to zero, and return the
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4437 position after the COUNTth match. Note that for reverse motion
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4438 this is not the same as the usual convention for Emacs motion commands.
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4439
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4440 If we don't find COUNT instances before reaching the end of the
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4441 buffer (or the beginning, if scanning backwards), set *SHORTAGE to
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4442 the number of line boundaries left unfound, and return the end of the
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4443 buffer we bumped up against. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4444
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4445 static int
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4446 display_scan_buffer (start, count, shortage)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4447 int *shortage, start;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4448 register int count;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4449 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4450 int limit = ((count > 0) ? ZV - 1 : BEGV);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4451 int direction = ((count > 0) ? 1 : -1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4452
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4453 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4454 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4455
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4456 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4457 register unsigned char *ceiling_addr;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4458
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4459 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4460 check only for newlines. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4461 if (! (!NILP (current_buffer->selective_display)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4462 && !INTEGERP (current_buffer->selective_display)))
9451
bdad001a9b91 (display_scan_buffer): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents: 9420
diff changeset
4463 return scan_buffer ('\n', start, 0, count, shortage, 0);
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4464
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4465 /* The code that follows is like scan_buffer
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4466 but checks for either newline or carriage return. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4467
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4468 if (shortage != 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4469 *shortage = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4470
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4471 if (count > 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4472 while (start != limit + 1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4473 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4474 ceiling = BUFFER_CEILING_OF (start);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4475 ceiling = min (limit, ceiling);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4476 ceiling_addr = POS_ADDR (ceiling) + 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4477 base = (cursor = POS_ADDR (start));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4478 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4479 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4480 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4481 ;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4482 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4483 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4484 if (--count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4485 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4486 immediate_quit = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4487 return (start + cursor - base + 1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4488 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4489 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4490 if (++cursor == ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4491 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4492 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4493 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4494 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4495 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4496 start += cursor - base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4497 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4498 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4499 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4500 start--; /* first character we scan */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4501 while (start > limit - 1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4502 { /* we WILL scan under start */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4503 ceiling = BUFFER_FLOOR_OF (start);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4504 ceiling = max (limit, ceiling);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4505 ceiling_addr = POS_ADDR (ceiling) - 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4506 base = (cursor = POS_ADDR (start));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4507 cursor++;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4508 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4509 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4510 while (--cursor != ceiling_addr
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4511 && *cursor != '\n' && *cursor != 015)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4512 ;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4513 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4514 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4515 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4516 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4517 immediate_quit = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4518 return (start + cursor - base + 1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4519 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4520 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4521 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4522 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4523 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4524 start += cursor - base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4525 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4526 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4527
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4528 if (shortage != 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4529 *shortage = count * direction;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4530 return (start + ((direction == 1 ? 0 : 1)));
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4531 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4532
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4533 /* Count up to N lines starting from FROM.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4534 But don't go beyond LIMIT.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4535 Return the number of lines thus found (always positive).
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4536 Store the position after what was found into *POS_PTR. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4537
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4538 static int
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4539 display_count_lines (from, limit, n, pos_ptr)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4540 int from, limit, n;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4541 int *pos_ptr;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4542 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4543 int oldbegv = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4544 int oldzv = ZV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4545 int shortage = 0;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4546
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4547 if (limit < from)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4548 BEGV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4549 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4550 ZV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4551
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4552 *pos_ptr = display_scan_buffer (from, n, &shortage);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4553
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4554 ZV = oldzv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4555 BEGV = oldbegv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4556
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4557 if (n < 0)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4558 /* When scanning backwards, scan_buffer stops *after* the last newline
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4559 it finds, but does count it. Compensate for that. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4560 return - n - shortage - (*pos_ptr != limit);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4561 return n - shortage;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4562 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4563
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4564 /* Display STRING on one line of window W, starting at HPOS.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4565 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
4566 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
4567 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4568
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4569 TRUNCATE is GLYPH to display at end if truncated. Zero for none.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4570
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4571 MINCOL is the first column ok to end at. (Pad with spaces to this col.)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4572 MAXCOL is the last column ok to end at. Truncate here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4573 -1 for MINCOL or MAXCOL means no explicit minimum or maximum.
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4574 Both count from the left edge of the frame, as does HPOS.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4575 The right edge of W is an implicit maximum.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4576 If TRUNCATE is nonzero, the implicit maximum is one column before the edge.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4577
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4578 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
4579 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
4580 and not display anything beyond there. Otherwise, only MAXCOL
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4581 controls where to stop output.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4582
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4583 Returns ending hpos. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4584
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4585 static int
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4586 display_string (w, vpos, string, length, hpos, truncate,
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4587 obey_window_width, mincol, maxcol)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4588 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4589 unsigned char *string;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4590 int length;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4591 int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4592 GLYPH truncate;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4593 int obey_window_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4594 int mincol, maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4595 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4596 register int c;
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4597 int truncated;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4598 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4599 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
4600 int tab_width = XINT (XBUFFER (w->buffer)->tab_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4601 register GLYPH *start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4602 register GLYPH *end;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4603 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
4604 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4605 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4606 int window_width = XFASTINT (w->width);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4607 /* If 1, we must display multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4608 int multibyte = !NILP (XBUFFER (w->buffer)->enable_multibyte_characters);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4609
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4610 /* Use the standard display table, not the window's display table.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4611 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
4612 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
4613 int i;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4614
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
4615 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
4616 dp = XCHAR_TABLE (Vstandard_display_table);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4617
2324
24cd3df6f184 (display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents: 2303
diff changeset
4618 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4619
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4620 p1 = p1start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4621 start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4622
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4623 if (obey_window_width)
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4624 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4625 end = start + window_width - (truncate != 0);
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4626
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4627 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
4628 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4629 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
4630 {
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4631 int i;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4632
8943
a9e40d478857 (display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents: 8919
diff changeset
4633 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
4634 *end-- = ' ';
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4635 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4636 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f))
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4637 *end-- = '|';
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4638 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4639 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4640
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4641 if (! obey_window_width
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4642 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4643 end = desired_glyphs->glyphs[vpos] + maxcol;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4644
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
4645 /* 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
4646 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
4647 desired_glyphs->charstarts[vpos][i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
4648
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4649 if (maxcol >= 0 && mincol > maxcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4650 mincol = maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4651
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4652 if (length < 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4653 /* We need this value for multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4654 length = strlen (string);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4655
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4656 /* 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
4657 (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
4658 truncated = 0;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4659 while (1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4660 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4661 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4662
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4663 if (length <= 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4664 break;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4665 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4666 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
4667 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4668 c = *string, len = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4669
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4670 string += len, length -= len;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4671
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4672 if (p1 >= end)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4673 {
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4674 truncated = 1;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4675 break;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4676 }
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4677
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4678 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
4679 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4680 p1 = copy_part_of_rope (f, p1, start,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4681 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4682 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4683 0);
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4684 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4685 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4686 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4687 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4688 *p1 = c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4689 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4690 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4691 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4692 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4693 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4694 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4695 if (p1 >= start && p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4696 *p1 = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4697 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4698 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4699 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4700 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4701 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4702 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4703 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
4704 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4705 (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
4706 && 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
4707 ? 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
4708 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4709 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4710 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4711 *p1 = c ^ 0100;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4712 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4713 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4714 else if (len == 1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4715 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4716 /* C is a control character or a binary byte data. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4717 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
4718 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4719 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp))
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4720 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp)))
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4721 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4722 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4723 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4724 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4725 *p1 = (c >> 6) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4726 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4727 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4728 *p1 = (7 & (c >> 3)) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4729 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4730 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4731 *p1 = (7 & c) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4732 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4733 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4734 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4735 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4736 /* C is a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4737 int charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4738 int columns = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4739 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4740 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4741
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4742 if (p1 < start)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4743 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4744 /* Since we can't show the left part of C, fill all
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4745 columns with spaces. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4746 columns -= start - p1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4747 p1 = start;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4748 while (columns--)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4749 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4750 if (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4751 *p1 = SPACEGLYPH;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4752 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4753 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4754 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4755 else if (p1 + columns > end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4756 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4757 /* Since we can't show the right part of C, fill all
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4758 columns with TRUNCATE if TRUNCATE is specified. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4759 if (truncate)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4760 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4761 while (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4762 *p1++ = fix_glyph (f, truncate, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4763 /* And tell the line is truncated. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4764 truncated = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4765 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4766 break;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4767 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4768 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4769 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4770 /* We can show the whole glyph of C. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4771 *p1++ = c;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4772 while (--columns)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4773 *p1++ = c | GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4774 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4775 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4776 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4777
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4778 if (truncated)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4779 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4780 p1 = end;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4781 if (truncate) *p1++ = fix_glyph (f, truncate, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4782 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4783 else if (mincol >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4784 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4785 end = desired_glyphs->glyphs[vpos] + mincol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4786 while (p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4787 *p1++ = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4788 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4789
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4790 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4791 register int len = p1 - desired_glyphs->glyphs[vpos];
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4792
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4793 if (len > desired_glyphs->used[vpos])
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4794 desired_glyphs->used[vpos] = len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4795 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4796
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4797 return len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4798 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4799 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4800
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4801 /* 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
4802 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
4803 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
4804 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
4805 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
4806 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4807 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4808
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4809 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4810 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4811 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4812 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4813 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4814 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4815 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
4816 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4817 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4818 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4819 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4820 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4821 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
4822 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4823 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4824 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4825 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4826 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4827 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4828 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4829 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4830 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
4831 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4832 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4833 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4834 if (EQ (propelt, tem))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4835 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4836 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
4837 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4838 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4839 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4840 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4841 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4842
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4843 /* 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
4844 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
4845 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
4846 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
4847 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
4848 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4849 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4850
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4851 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4852 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4853 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4854 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4855 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4856 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4857 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
4858 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4859 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4860 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4861 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
4862 return ! NILP (XCONS (tem)->cdr);
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4863 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4864 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4865 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4866 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4867 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4868 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4869 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4870 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
4871 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4872 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4873 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4874 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
4875 return ! NILP (XCONS (tem)->cdr);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4876 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4877 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4878 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4879 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4880
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4881 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4882 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4883 {
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
4884 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
4885 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
4886
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
4887 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
4888 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
4889
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
4890 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
4891 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
4892
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
4893 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
4894 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
4895
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
4896 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
4897 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
4898
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4899 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4900 staticpro (&last_arrow_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4901 last_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4902 last_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4903
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4904 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
4905 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4906 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4907
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4908 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4909 "Marker for where to display an arrow on top of the buffer text.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4910 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4911 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4912 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4913
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4914 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4915 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4916 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4917
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4918 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4919 "*The number of lines to try scrolling a window by when point moves out.\n\
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4920 If that fails to bring point back on frame, point is centered instead.\n\
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4921 If this is zero, point is always centered after it moves off frame.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4922
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
4923 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
4924 "*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
4925 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
4926
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
4927 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
4928 "*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
4929 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
4930 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
4931 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
4932
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4933 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4934
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4935 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4936 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4937 "*Non-nil means truncate lines in all windows less than full frame wide.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4938 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4939
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4940 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4941 "*Non-nil means use inverse video for the mode line.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4942 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4943
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4944 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4945 "*Maximum buffer size for which line number should be displayed.");
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4946 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
4947
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
4948 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
4949 "*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
4950 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
4951
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4952 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
4953 "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
4954 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
4955 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
4956 `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
4957
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4958 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
4959 "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
4960 \(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
4961 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
4962 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
4963 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4964 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
4965 "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
4966 \(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
4967 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
4968 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
4969 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4970 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4971 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4972 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4973 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4974 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4975 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4976 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4977 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4978 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4979 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4980
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4981 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4982 "Maximum number of lines to keep in the message log buffer.\n\
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4983 If nil, disable message logging. If t, log messages but don't truncate\n\
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4984 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4985 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
4986
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
4987 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
4988 "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
4989 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
4990 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
4991 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
4992 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
4993 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
4994
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
4995 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
4996 "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
4997 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
4998 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
4999 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
5000 Vwindow_scroll_functions = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5001 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5002
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5003 /* initialize the window system */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5004 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5005 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5006 Lisp_Object root_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5007 #ifndef COMPILER_REGISTER_BUG
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5008 register
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5009 #endif /* COMPILER_REGISTER_BUG */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5010 struct window *mini_w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5011
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5012 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5013
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5014 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
5015 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5016
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5017 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5018 previous_echo_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5019
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5020 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5021 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5022 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
5023 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
5024 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
5025 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
5026 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5027 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5028 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5029
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5030 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
5031 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5032 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5033 }