annotate src/xdisp.c @ 20229:328506fc1aa2

(Fsref): If IDX points an 8-bit code which is not part of multibyte characters, return it. Pay attention to enable-multibyte-characters.
author Kenichi Handa <handa@m17n.org>
date Sat, 08 Nov 1997 03:05:44 +0000
parents 422958809490
children ebebe05191b4
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.
18730
492cb3baf591 (display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents: 18718
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 1997
492cb3baf591 (display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents: 18718
diff changeset
3 Free Software Foundation, Inc.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14178
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14178
diff changeset
20 Boston, MA 02111-1307, USA. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4423
diff changeset
23 #include <config.h>
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include <stdio.h>
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 /*#include <ctype.h>*/
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #undef NULL
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "lisp.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
28 #include "frame.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "window.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "termchar.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "dispextern.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "buffer.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
33 #include "charset.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #include "indent.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #include "commands.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 #include "macros.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 #include "disptab.h"
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
38 #include "termhooks.h"
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
39 #include "intervals.h"
12081
0d7b62a295be Include keyboard.h.
Karl Heuer <kwzh@gnu.org>
parents: 12022
diff changeset
40 #include "keyboard.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
41 #include "coding.h"
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
42 #include "process.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
44 #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
45 extern void set_frame_menubar ();
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
46 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
47 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
48
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
52 extern int minibuffer_auto_raise;
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
53
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
54 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
55
12171
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;
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
57 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
58
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
59 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
60 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
61 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
62
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
63 /* Nonzero means print newline to stdout before next minibuffer message. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
67 /* 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
68
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
69 static int message_log_need_newline;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
70
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71 #define min(a, b) ((a) < (b) ? (a) : (b))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 #define max(a, b) ((a) > (b) ? (a) : (b))
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
73 #define minmax(floor, val, ceil) \
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
74 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76 /* The buffer position of the first character appearing
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
77 entirely or partially on the current frame line.
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
78 Or zero, which disables the optimization for the current frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
79 static int this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 /* Number of characters past the end of this line,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82 including the terminating newline */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
83 static int this_line_endpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
84
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
85 /* The vertical position of this frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86 static int this_line_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
88 /* Hpos value for start of display on this frame line.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 Usually zero, but negative if first character really began
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 on previous line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 static int this_line_start_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 /* Buffer that this_line variables are describing. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 /* 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
97 If this is nonzero, there is a message on the frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 in the minibuffer and it should be erased as soon
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 as it is no longer requested to appear. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 char *previous_echo_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
102 /* Nonzero means truncate lines in all windows less wide than the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
105 /* 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
106 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
107 int multiple_frames;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
108
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 /* Marker for where to display an arrow on top of the buffer text. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 /* String to display for the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
117 /* Values of those variables at last redisplay.
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
118 However, if Voverlay_arrow_position is a marker,
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
119 last_arrow_position is its numerical position. */
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
120 static Lisp_Object last_arrow_position, last_arrow_string;
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
121
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
122 /* 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
123 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
124
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
125 /* 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
126 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
127
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
128 /* 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
129 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
130 have changed. */
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
131 static Lisp_Object Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
132
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
133 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
134
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 /* Nonzero if overlay arrow has been displayed once in this window. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
138 /* 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
139 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
140 strings that get displayed there.) */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
141 static int zv_strings_seen;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
142
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
143 /* 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
144 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
145
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
146 /* If cursor motion alone moves point off frame,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 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
148 static int scroll_step;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
150 /* 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
151 when appropriate. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
152 static int scroll_conservatively;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
153
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
154 /* 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
155 of the top or bottom of the window. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
156 int scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
157
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 /* Nonzero if try_window_id has made blank lines at window bottom
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 since the last redisplay that paused */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 static int blank_end_of_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
162 /* 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
163 (or another buffer with the same base buffer).
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164 keyboard.c refers to this. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
167 /* 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
168 whether the window is selected or not.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 Set one to -1 first to determine whether point was found afterwards. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 static int cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 static int cursor_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
174 static int debug_end_pos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 /* Nonzero means display mode line highlighted */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
179 static void redisplay_internal ();
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
180 static int message_log_check_duplicate ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 static void echo_area_display ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 void mark_window_display_accurate ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 static void redisplay_windows ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 static void redisplay_window ();
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
185 static void update_menu_bar ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 static void try_window ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 static int try_window_id ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188 static struct position *display_text_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 static void display_mode_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 static int display_mode_element ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 static char *decode_mode_spec ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 static int display_string ();
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
193 static void display_menu_bar ();
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
194 static int display_count_lines ();
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 /* 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
197 Lisp_Object minibuf_prompt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 /* Width in columns of current minibuffer prompt. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 int minibuf_prompt_width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 /* Message to display instead of minibuffer contents
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 This is what the functions error and message make,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 and command echoing uses it as well.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 It overrides the minibuf_prompt as well as the buffer. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 char *echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
208 /* 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
209 int echo_area_glyphs_length;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
210
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
211 /* 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
212 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
213 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
214 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
215
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
216 /* Nonzero means multibyte characters were enabled when the echo area
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
217 message was specified. */
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
218 int message_enable_multibyte;
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
219
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 /* true iff we should redraw the mode lines on the next redisplay */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 /* Smallest number of characters before the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 int beg_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 /* Smallest number of characters after the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 int end_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 /* 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
234 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
235 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 contain no useful information */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 int unchanged_modified;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
239 /* 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
240 int overlay_unchanged_modified;
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
241
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 /* Nonzero if window sizes or contents have changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 since last redisplay that finished */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
246 /* 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
247 and it displayed a line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
248 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
249
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
250 /* 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
251 static int line_number_display_limit;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
252
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
253 /* 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
254 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
255 Lisp_Object Vmessage_log_max;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
256
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
257 #define COERCE_MARKER(X) \
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
258 (MARKERP ((X)) ? Fmarker_position (X) : (X))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
260 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
261
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
262 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
263 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
264 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
265 if (message_log_need_newline)
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
266 message_dolog ("", 0, 1);
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
267 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
268
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
269
10442
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
270 /* 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
271 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
272 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
273
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
274 void
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
275 message_dolog (m, len, nlflag)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
276 char *m;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
277 int len, nlflag;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
278 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
279 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
280 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
281 struct buffer *oldbuf;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
282 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
283 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
284
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
285 oldbuf = current_buffer;
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
286 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
287 current_buffer->undo_list = Qt;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
288 oldpoint = PT;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
289 oldbegv = BEGV;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
290 oldzv = ZV;
10442
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
291 BEGV = BEG;
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
292 ZV = Z;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
293 if (oldpoint == Z)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
294 oldpoint += len + nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
295 if (oldzv == Z)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
296 oldzv += len + nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
297 TEMP_SET_PT (Z);
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
298 if (len)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
299 insert_1 (m, len, 1, 0);
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
300 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
301 {
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
302 int this_bol, prev_bol, dup;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
303 insert_1 ("\n", 1, 1, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
304
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
305 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
306 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
307 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
308 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
309 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
310 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
311 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
312 if (oldpoint > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
313 oldpoint -= min (this_bol, oldpoint) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
314 if (oldbegv > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
315 oldbegv -= min (this_bol, oldbegv) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
316 if (oldzv > prev_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
317 oldzv -= min (this_bol, oldzv) - prev_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
318 del_range_1 (prev_bol, this_bol, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
319 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
320 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
321 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
322 int duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
323
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
324 /* 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
325 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
326 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
327 duplen = strlen (dupstr);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
328 TEMP_SET_PT (Z-1);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
329 if (oldpoint == Z)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
330 oldpoint += duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
331 if (oldzv == Z)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
332 oldzv += duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
333 insert_1 (dupstr, duplen, 1, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
334 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
335 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
336 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
337
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
338 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
339 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
340 int pos = scan_buffer ('\n', Z, 0,
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
341 -XFASTINT (Vmessage_log_max) - 1, 0, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
342 oldpoint -= min (pos, oldpoint) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
343 oldbegv -= min (pos, oldbegv) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
344 oldzv -= min (pos, oldzv) - BEG;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
345 del_range_1 (BEG, pos, 0);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
346 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
347 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
348 BEGV = oldbegv;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
349 ZV = oldzv;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
350 TEMP_SET_PT (oldpoint);
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
351 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
352 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
353 message_log_need_newline = !nlflag;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
354 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
355 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
356
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
357 /* 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
358 (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
359 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
360 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
361 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
362
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
363 static int
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
364 message_log_check_duplicate (prev_bol, this_bol)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
365 int prev_bol, this_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
366 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
367 int i;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
368 int len = Z - 1 - this_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
369 int seen_dots = 0;
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
370 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
371 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
372
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
373 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
374 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
375 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
376 && p1[i] != '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
377 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
378 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
379 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
380 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
381 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
382 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
383 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
384 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
385 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
386 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
387 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
388 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
389 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
390 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
391 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
392 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
393 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
394
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
395 /* 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
396 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
397 existing message, and let the minibuffer text show through.
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
398
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
399 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
400 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
401
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
402 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
403 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
404
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
405 void
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
406 message2 (m, len)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
407 char *m;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
408 int len;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
409 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
410 /* 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
411 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
412 if (m)
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
413 message_dolog (m, len, 1);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
414 message2_nolog (m, len);
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
415 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
416
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
417
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
418 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
419
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
420 void
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
421 message2_nolog (m, len)
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
422 char *m;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
423 int len;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
424 {
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
425 message_enable_multibyte
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
426 = ! NILP (current_buffer->enable_multibyte_characters);
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
427
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
428 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
429 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
430 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
431 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
432 noninteractive_need_newline = 0;
18752
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
433 if (m)
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
434 fwrite (m, len, 1, stderr);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
435 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
436 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
437 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
438 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
439 /* 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
440 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
441 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
442 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
443 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
444 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
445 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
446
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
447 /* 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
448 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
449 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
450 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
451
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
452 FRAME_SAMPLE_VISIBILITY (f);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
453 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
454 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
455 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
456
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
457 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
458 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
459 echo_area_glyphs = m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
460 echo_area_glyphs_length = len;
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
461
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
462 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
463 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
464 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
465 else
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
466 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
467
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
468 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
469 echo_area_display ();
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
470 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
471 do_pending_window_change ();
6661
a26e7181f36b (display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents: 6650
diff changeset
472 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
473 (*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
474 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
475 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
476
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
477 /* 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
478 existing message, and let the minibuffer text show through.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
479
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
480 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
481 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
482
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
483 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
484 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
485
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
486 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
487 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
488 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
489 {
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
490 message2 (m, (m ? strlen (m) : 0));
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
491 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
492
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
493 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
494 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
495 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
496 {
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
497 message2_nolog (m, (m ? strlen (m) : 0));
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
498 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
499
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
500 /* 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
501 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
502
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
503 void
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
504 truncate_echo_area (len)
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
505 int len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
506 {
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
507 /* 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
508 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
509 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
510 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
511 echo_area_glyphs_length = len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
512 }
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
513
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
514 /* 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
515 zero if being used by message. */
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
516 int message_buf_print;
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
517
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
518 /* 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
519 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
520
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
521 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
525 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
529 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
530 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
531 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
532 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
533 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
534 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
535 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
536 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
537 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
538 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
540 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
541 {
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
542 /* 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
543 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
544 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
545 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
546 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
547
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
548 /* 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
549 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
550 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
551 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
553 /* 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
554 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
555 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
556 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
557 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
558 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
559 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
560 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
561 #ifdef NO_ARG_ARRAY
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
562 EMACS_INT a[3];
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
563 a[0] = a1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
564 a[1] = a2;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
565 a[2] = a3;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
566
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
567 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
568 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
569 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
570 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
571 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
572 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
573
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
574 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
575 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
576 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
577 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
578
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
579 /* 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
580 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
581 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
582 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
583 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
584 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
586 /* The non-logging version of message. */
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
587 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
588 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
589 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
590 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
591 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
592 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
593 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
594 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
595 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
596 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
597 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
598
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
599 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
600 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
601 {
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
602 message2 (echo_area_glyphs, echo_area_glyphs_length);
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
603 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
604
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606 echo_area_display ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
607 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 register int vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
609 FRAME_PTR f;
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
610 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
611
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
612 /* 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
613 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
614 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
615 /* 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
616 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
618 if (! FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
619 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
620
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
621 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
622 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
623 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
624 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
627 if (echo_area_glyphs || minibuf_level == 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
628 {
16266
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
629 int i;
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
630
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
631 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
632
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
633 vpos = XFASTINT (XWINDOW (mini_window)->top);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
634 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
635
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
636 /* 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
637 are always clear. */
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
638 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
639 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
640
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
641 display_string (XWINDOW (mini_window), vpos,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
642 echo_area_glyphs ? echo_area_glyphs : "",
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
643 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
644 FRAME_LEFT_SCROLL_BAR_WIDTH (f),
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
645 0, 0, 0,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
646 FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f),
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
647 message_enable_multibyte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
649 #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
650 /* 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
651 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
652 FRAME_CURSOR_Y (f) = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
653 if (FRAME_CURSOR_Y (f) == vpos)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
654 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
655 #endif
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
656
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
657 /* Fill the rest of the minibuffer window with blank lines. */
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
658 {
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
659 int i;
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
660
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
661 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
662 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
663 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
664 get_display_line (f, i, 0);
18718
1fb4c75d4f1f (echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents: 18703
diff changeset
665 /* We don't use FRAME_SCROLL_BAR_WIDTH (f) as the starting
1fb4c75d4f1f (echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents: 18703
diff changeset
666 hpos, because it is good to clear whatever is behind the
1fb4c75d4f1f (echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents: 18703
diff changeset
667 scroll bar. This does not affect the scroll bar itself. */
18653
2c1f73252c1c (echo_area_display): Use proper vpos when clearing extra minibuf lines.
Richard M. Stallman <rms@gnu.org>
parents: 18652
diff changeset
668 display_string (XWINDOW (mini_window), i,
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
669 "", 0,
18718
1fb4c75d4f1f (echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents: 18703
diff changeset
670 0, 0, 0,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
671 0, FRAME_WIDTH (f) + FRAME_SCROLL_BAR_WIDTH (f),
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
672 0);
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
673 }
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
674 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
675 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
676 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
677 windows_or_buffers_changed++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
679 if (EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
680 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
681
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
682 previous_echo_glyphs = echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
683 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
684
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
685 /* 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
686
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
687 #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
688 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
689 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
690
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
691 static int
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
692 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
693 char *str;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
694 int mincol, maxcol;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
695 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
696 char *limit;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
697 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
698 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
699 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
700 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
701 *frame_title_ptr++ = *str++;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
702 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
703 *frame_title_ptr++ = ' ';
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
704 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
705 }
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
706
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
707 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
708 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
709 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
710 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
711 Lisp_Object fmt;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
712 struct buffer *obuf;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
713 int len;
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
714 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
715
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
716 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
717 return;
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
718
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
719 /* 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
720 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
721 Lisp_Object tail;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
722
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
723 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
724 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
725 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
726
11948
19ebc17d1288 (x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents: 11920
diff changeset
727 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
728 && !FRAME_MINIBUF_ONLY_P (tf)
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
729 && (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
730 break;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
731 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
732
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
733 multiple_frames = CONSP (tail);
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
734 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
735
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
736 obuf = current_buffer;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
737 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
738 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
739 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
740 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
741 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
742 frame_title_ptr = 0;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
743 set_buffer_internal (obuf);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
744 /* 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
745 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
746 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
747 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
748 level than this.) */
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
749 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
750 || 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
751 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
752 }
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
753 #else
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
754 #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
755 #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
756 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
757
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
758 /* 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
759 This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
760
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
761 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
762 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
763 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
764 register struct window *w = XWINDOW (selected_window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
765 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
766 struct gcpro gcpro1, gcpro2;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
767
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
768 all_windows = (update_mode_lines || buffer_shared > 1
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
769 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
770
11920
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
771 /* 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
772 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
773 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
774
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
775 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
776 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
777 "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
778 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
779 has yet been specified."
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
780 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
781 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
782 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
783 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
784 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
785
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
786 FOR_EACH_FRAME (tail, frame)
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
787 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
788 || FRAME_ICONIFIED_P (XFRAME (frame)))
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
789 x_consider_frame_title (frame);
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
790 }
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
791 #endif
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
792
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
793 /* Update the menu bar item lists, if appropriate.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
794 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
795 or generation of display lines. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
796 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
797 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
798 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
799 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
800
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
801 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
802
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
803 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
804 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
805 /* 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
806 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
807 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
808 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
809 Lisp_Object functions;
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
810 /* 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
811 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
812 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
813 GCPRO2 (tail, functions);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
814 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
815 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
816 call1 (XCONS (functions)->car, frame);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
817 functions = XCONS (functions)->cdr;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
818 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
819 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
820 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
821 GCPRO1 (tail);
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
822 update_menu_bar (XFRAME (frame), 0);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
823 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
824 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
825
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
826 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
827 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
828 else
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
829 update_menu_bar (selected_frame, 1);
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
830
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
831 /* 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
832 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
833 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
834 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
835 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
836 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
837
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
838 /* Do a frame update, taking possible shortcuts into account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
839 This is the main external entry point for redisplay.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
840
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
841 If the last redisplay displayed an echo area message and that
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
842 message is no longer requested, we clear the echo area
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
843 or bring back the minibuffer if that is in use.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
844
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
845 Do not call eval from within this function.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
846 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
847 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
848 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
849 but can still lose, because this function
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
850 can be called from signal handlers; with alarms set up;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
851 or with synchronous processes running.
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
852
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
853 See Fcall_process; if you called it from here, it could be
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
854 entered recursively. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
855
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
856 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
857
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
858 /* 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
859 no more than once ever 1000 redisplays. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
860 static int clear_face_cache_count;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
861
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
862 /* Record the previous terminal frame we displayed. */
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
863 static FRAME_PTR previous_terminal_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
864
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 redisplay ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
868 redisplay_internal (0);
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
869 }
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
870
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
871 /* 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
872 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
873 preserve the echo area. (Actually, our caller does that job.)
21d5ceaa4d23 Commenht change.
Richard M. Stallman <rms@gnu.org>
parents: 14682
diff changeset
874 Perhaps in the future avoid recentering windows
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
875 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
876
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
877 static void
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
878 redisplay_internal (preserve_echo_area)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
879 int preserve_echo_area;
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
880 {
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
881 register struct window *w = XWINDOW (selected_window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
882 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883 int must_finish = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 int all_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 register int tlbufpos, tlendpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
886 struct position pos;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
887 int number_of_visible_frames;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
888
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
889 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891
14559
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
892 #ifdef USE_X_TOOLKIT
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
893 if (popup_activated ())
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
894 return;
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
895 #endif
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
896
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
897 retry:
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
898
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
899 if (! FRAME_WINDOW_P (selected_frame)
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
900 && previous_terminal_frame != selected_frame)
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
901 {
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
902 /* 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
903 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
904 windows_or_buffers_changed++;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
905 SET_FRAME_GARBAGED (selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
906 XSETFRAME (Vterminal_frame, selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
907 }
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
908 previous_terminal_frame = selected_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
909
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
910 /* 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
911 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
912 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
913 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
914 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
915 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
916
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
917 number_of_visible_frames = 0;
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
918
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
919 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
920 {
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
921 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
922
19197
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
923 if (FRAME_VISIBLE_P (XFRAME (frame)))
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
924 number_of_visible_frames++;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
925
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
926 /* 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
927 glyphs to display. */
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
928 init_desired_glyphs (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
929 }
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
930 }
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
931
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
932 /* Notice any pending interrupt request to change frame size. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
935 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
937 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
938 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
941 prepare_menu_bars ();
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
942
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
943 if (windows_or_buffers_changed)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
944 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
945
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
946 /* 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
947 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
948 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
949 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
950 if (buffer_shared > 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
951 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
952 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
954 /* If %c is in use, update it if needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
955 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
956 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
957 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
958 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
959 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
960 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
961 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
962 w->update_mode_line = Qt;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
963
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
964 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
965
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 all_windows = update_mode_lines || buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
968 /* If specs for an arrow have changed, do thorough redisplay
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
969 to ensure we remove any arrow that should no longer exist. */
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
970 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position)
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
971 || ! EQ (Voverlay_arrow_string, last_arrow_string))
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
972 all_windows = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
973
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
974 /* 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
975 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
976 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
977 again here. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
978 if (echo_area_glyphs || previous_echo_glyphs)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
979 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
980 echo_area_display ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
981 must_finish = 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
982 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
983
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
984 /* 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
985 if (((!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
986 && !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
987 != !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
988 || (!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
989 && !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
990 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
991 this_line_bufpos = -1;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
992
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
993 tlbufpos = this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 tlendpos = this_line_endpos;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
995 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
996 && !current_buffer->clip_changed
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
997 && FRAME_VISIBLE_P (XFRAME (w->frame))
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
998 && !FRAME_OBSCURED_P (XFRAME (w->frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
999 /* Make sure recorded data applies to current buffer, etc */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1000 && this_line_buffer == current_buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1001 && current_buffer == XBUFFER (w->buffer)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1002 && NILP (w->force_start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003 /* 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
1004 && PT >= tlbufpos
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1005 && PT <= Z - tlendpos
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1006 /* All text outside that line, including its final newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007 must be unchanged */
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1008 && ((XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1009 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1010 || (beg_unchanged >= tlbufpos - 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1011 && GPT >= tlbufpos
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1012 /* If selective display, can't optimize
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1013 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
1014 && ((INTEGERP (current_buffer->selective_display)
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1015 && XINT (current_buffer->selective_display) > 0
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1016 ? (beg_unchanged >= tlbufpos
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1017 && GPT > tlbufpos)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1018 : 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019 && end_unchanged >= tlendpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 && Z - GPT >= tlendpos)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1022 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1023 && (tlbufpos == ZV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1024 || FETCH_BYTE (tlbufpos) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1025 /* Former continuation line has disappeared by becoming empty */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1026 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1027 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
1028 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1029 || MINI_WINDOW_P (w))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1030 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1031 /* 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
1032 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
1033 line 885).
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1034
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1035 For instance, in the following case:
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1036
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1037 -------- Insert --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1038 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
1039 J_I_ ==> J_I_ `^^' are cursors.
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1040 ^^ ^^
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1041 -------- --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1042
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1043 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
1044
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1045 struct position val;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1046 int prevline;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1047
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1048 prevline = find_next_newline (tlbufpos, -1);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1049 val = *compute_motion (prevline, 0,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1050 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
1051 0,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1052 tlbufpos,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1053 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1054 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1055 window_internal_width (w) - 1,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1056 XINT (w->hscroll), 0, w);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1057 if (val.hpos != this_line_start_hpos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1058 goto cancel;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1059
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1062 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1063 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
1064 pos_tab_offset (w, tlbufpos), 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 /* If line contains point, is not continued,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 and ends at same distance from eob as before, we win */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 if (cursor_vpos >= 0 && this_line_bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 && this_line_endpos == tlendpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 {
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
1070 /* 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
1071 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
1072 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
1073 < 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
1074 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1075 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
1076 int *charstart_next_line
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1077 = 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
1078 int adjust;
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1079
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1080 if (Z - tlendpos == ZV)
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1081 /* 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
1082 There is no newline to count. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1083 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
1084 else
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1085 /* This line ends in a newline.
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1086 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
1087 text that follows. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1088 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
1089
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1090 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
1091 }
6619
b3631c88ec7e (redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents: 6612
diff changeset
1092
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1093 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1098 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1099 }
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
1100 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
1101 /* 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
1102 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
1103 && 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
1104 && (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
1105 > FRAME_CURSOR_Y (selected_frame)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 if (!must_finish)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 }
11641
748feea0a51a (redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11531
diff changeset
1114 /* 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
1115 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
1116 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
1117 && !NILP (current_buffer->mark_active))
17698
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1118 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1119 || 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
1120 && 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
1121 && !cursor_in_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123 pos = *compute_motion (tlbufpos, 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1124 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1125 0,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1126 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
1127 window_internal_width (w) - 1,
574
58047bf5d46c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 528
diff changeset
1128 XINT (w->hscroll),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
1129 pos_tab_offset (w, tlbufpos), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1130 if (pos.vpos < 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1131 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1132 int width = window_internal_width (w) - 1;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1133 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
1134 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1135 FRAME_CURSOR_Y (selected_frame) = this_line_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1138 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1139 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1140 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1141 cancel:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 /* Text changed drastically or point moved off of line */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1143 cancel_line (this_line_vpos, selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1144 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1145
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1146 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 all_windows |= buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1149 clear_face_cache_count++;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1150
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1151 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1153 Lisp_Object tail, frame;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1154
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
1155 #ifdef HAVE_FACES
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1156 /* 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
1157 and not too often either. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1158 if (clear_face_cache_count > 1000)
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1159 {
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1160 clear_face_cache ();
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1161 clear_face_cache_count = 0;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1162 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1163 #endif
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1164
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165 /* Recompute # windows showing selected buffer.
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1166 This will be incremented each time such a window is displayed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167 buffer_shared = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1168
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1169 FOR_EACH_FRAME (tail, frame)
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1170 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1171 FRAME_PTR f = XFRAME (frame);
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1172 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
1173 {
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1174
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1175 /* 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
1176 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
1177 if (condemn_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1178 (*condemn_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1179
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1180 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1181 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
1182
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1183 /* 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
1184 should now go away. */
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1185 if (judge_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1186 (*judge_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1187 }
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1188 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 }
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1190 else if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1191 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1192 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
1193 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1194 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1195 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 update:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1198 /* Prevent various kinds of signals during display update.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 stdio is not robust about handling signals,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 which can cause an apparent I/O error. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202 unrequest_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 stop_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1205 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 Lisp_Object tail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1208
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1209 pause = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1210
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1211 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1212 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1213 FRAME_PTR f;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1214
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1215 if (!FRAMEP (XCONS (tail)->car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216 continue;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1217
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1218 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
1219
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1220 if ((FRAME_WINDOW_P (f) || f == selected_frame)
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1221 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1222 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1223 pause |= update_frame (f, 0, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1224 if (!pause)
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1225 {
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1226 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
1227 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
1228 (*frame_up_to_date_hook) (f);
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1229 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1230 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233 else
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1234 {
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1235 if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1236 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
1237 else
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1238 pause = 0;
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1239
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1240 /* 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
1241 function. If the echo area is on another frame, that may
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1242 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
1243 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
1244 it here. */
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1245 {
12792
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1246 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
1247 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
1248
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1249 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
1250 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1251
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1252 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1253 pause |= update_frame (mini_frame, 0, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1254 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1255 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1256
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1257 /* If frame does not match, prevent doing single-line-update next time.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 Also, don't forget to check every line to update the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 if (pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1260 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1261 this_line_bufpos = 0;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1262 if (!NILP (last_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1263 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1264 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1265 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1266 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1267 /* If we pause after scrolling, some lines in current_frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 may be null, so preserve_other_columns won't be able to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1269 preserve all the vertical-bar separators. So, avoid using it
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270 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
1271 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 update_mode_lines = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1275 /* Now text on frame agrees with windows, so
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1276 put info into the windows for partial redisplay to follow */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1278 if (!pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1279 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1280 register struct buffer *b = XBUFFER (w->buffer);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1281
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1282 blank_end_of_window = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1283 unchanged_modified = BUF_MODIFF (b);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1284 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 beg_unchanged = BUF_GPT (b) - BUF_BEG (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286 end_unchanged = BUF_Z (b) - BUF_GPT (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1287
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1288 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
1289 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
1290 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (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 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
1293 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1295 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1296 b->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1297 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
1298 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
1299 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
1300 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1301 = (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
1302 ? Qt : Qnil);
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1303
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1304 /* 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
1305 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
1306 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
1307 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1308 || 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
1309 && !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
1310 ? 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
1311 : Qnil);
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1312
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1313 w->window_end_valid = w->buffer;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1314 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315 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
1316 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
1317 verify_charstarts (w);
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1318 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
1319 (*frame_up_to_date_hook) (selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1320 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1321 update_mode_lines = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322 windows_or_buffers_changed = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1323 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1324
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1325 /* Start SIGIO interrupts coming again.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1326 Having them off during the code above
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1327 makes it less likely one will discard output,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 but not impossible, since there might be stuff
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1329 in the system buffer here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1330 But it is much hairier to try to do anything about that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1331
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1332 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1333 request_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1334 start_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1336 /* If something has become visible now which was not before,
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1337 redisplay again, so that we get them. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1338 if (!pause)
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1339 {
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1340 Lisp_Object tail, frame;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1341 int new_count = 0;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1342
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1343 FOR_EACH_FRAME (tail, frame)
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1344 {
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1345 int this_is_visible = 0;
19197
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1346
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1347 if (XFRAME (frame)->visible)
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1348 this_is_visible = 1;
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1349 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1350 if (XFRAME (frame)->visible)
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1351 this_is_visible = 1;
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1352
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1353 if (this_is_visible)
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1354 new_count++;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1355 }
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1356
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1357 if (new_count != number_of_visible_frames)
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1358 windows_or_buffers_changed++;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1359 }
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1360
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1361 /* Change frame size now if a change is pending. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362 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
1363
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1364 /* If we just did a pending size change, or have additional
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1365 visible frames, redisplay again. */
7757
8d27747de7ca (redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents: 7752
diff changeset
1366 if (windows_or_buffers_changed && !pause)
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1367 goto retry;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1369
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1370 /* Redisplay, but leave alone any recent echo area message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1371 unless another message has been requested in its place.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1372
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1373 This is useful in situations where you need to redisplay but no
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 user action has occurred, making it inappropriate for the message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375 area to be cleared. See tracking_off and
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 wait_reading_process_input for examples of these situations. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378 redisplay_preserve_echo_area ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1381 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382 echo_area_glyphs = previous_echo_glyphs;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1383 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1384 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1385 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1386 else
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1387 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1388 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391 mark_window_display_accurate (window, flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1392 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393 int flag;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1394 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1395 register struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1396
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1397 for (;!NILP (window); window = w->next)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1398 {
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1399 if (!WINDOWP (window)) abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1402 if (!NILP (w->buffer))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1403 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1404 XSETFASTINT (w->last_modified,
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1405 !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
1406 XSETFASTINT (w->last_overlay_modified,
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1407 !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
1408 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1409 = (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
1410 ? Qt : Qnil);
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1411
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1412 /* 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
1413 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
1414 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
1415 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1416 || highlight_nonselected_windows)
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1417 && !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
1418 ? 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
1419 : Qnil);
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1420 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1421
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1422 w->window_end_valid = w->buffer;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423 w->update_mode_line = Qnil;
14263
082e86e9bca3 (mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents: 14206
diff changeset
1424 if (!NILP (w->buffer) && flag)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1425 XBUFFER (w->buffer)->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1426
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1427 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 mark_window_display_accurate (w->vchild, flag);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1429 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430 mark_window_display_accurate (w->hchild, flag);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 if (flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1434 {
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1435 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436 last_arrow_string = Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1439 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1440 /* t is unequal to any useful value of Voverlay_arrow_... */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1441 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1446 /* 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
1447 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
1448 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
1449
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1450 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
1451
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1452 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1453 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
1454 FRAME_PTR f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1455 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1456 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1457 struct buffer *old = current_buffer;
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1458 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1459 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
1460
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1461 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1462 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1463
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1464 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1465 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1466
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
1467 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
1468 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
1469 #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
1470 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
1471 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
1472 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
1473 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
1474 : FRAME_MENU_BAR_LINES (f) > 0)
5230
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 /* 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
1477 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
1478 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
1479 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
1480 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
1481 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
1482 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1483 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
1484 || !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
1485 || ((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
1486 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1487 != !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
1488 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
1489 && !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
1490 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1491 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1492 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
1493 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
1494
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
1495 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
1496 if (save_match_data)
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
1497 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
1498 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1499 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1500 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1501 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1502 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1503
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1504 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1505 call1 (Vrun_hooks, Qactivate_menubar_hook);
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1506 /* 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
1507 really recompute the menubar from the value. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1508 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1509 call0 (Qrecompute_lucid_menubar);
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
1510 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
1511 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
1512 /* 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
1513 #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
1514 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
1515 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
1516 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1517 /* 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
1518 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
1519 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1520 #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
1521 /* 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
1522 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
1523 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1524 #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
1525
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1526 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
1527 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1528 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1529 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1530 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1531
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 int do_id = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1534 /* Redisplay WINDOW and its subwindows and siblings. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1535
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1537 redisplay_windows (window, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1538 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1539 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1540 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1541 for (; !NILP (window); window = XWINDOW (window)->next)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1542 redisplay_window (window, 0, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1545 /* 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
1546 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
1547 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
1548 macro DISP_CHAR_VECTOR. */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1549 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1550 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
1551 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
1552 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1553 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1554 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1555 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1556
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1557 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
1558
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1559 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
1560 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
1561 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1562 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
1563 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
1564 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1565 /* 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
1566 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
1567 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
1568 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
1569 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1570 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1571
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1572 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
1573 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1574 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
1575 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
1576 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
1577 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1578 /* 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
1579 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1580 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1581
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1582 /* Redisplay window WINDOW and its subwindows. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1583
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1585 redisplay_window (window, just_this_one, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1586 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1587 int just_this_one, preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1588 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1589 register struct window *w = XWINDOW (window);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1590 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1591 int height;
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1592 register int lpoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1593 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
1594 register int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1595 register int startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1596 register int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1597 struct position pos;
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1598 int opoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1599 int tem;
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1600 int update_mode_line;
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1601 struct Lisp_Char_Table *dp = window_display_table (w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1603 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1604
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605 /* If this is a combination window, do its children; that's all. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1606
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1607 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1608 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1609 redisplay_windows (w->vchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1610 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1611 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1612 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1614 redisplay_windows (w->hchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1615 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1616 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1617 if (NILP (w->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1618 abort ();
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1619
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1620 height = window_internal_height (w);
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1621 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
1622 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
1623 update_mode_line = 1;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1624
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1625 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1626 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1627 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
1628 /* 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
1629 goto finish_scroll_bars;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1630 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1631 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1632 /* 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
1633 so clear it. */
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1634 int vpos = XFASTINT (w->top);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1635 int i;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1636
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1637 for (i = 0; i < height; i++)
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1638 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1639 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
1640 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
1641 FRAME_LEFT_SCROLL_BAR_WIDTH (f),
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
1642 0, 1, 0, width, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1643 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1644
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1645 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1646 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1647 }
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 /* Otherwise set up data on this window; select its buffer and point value */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1650
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1651 if (update_mode_line)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
1652 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
1653 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1654 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
1655
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1656 opoint = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1658 /* 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
1659 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1660 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1661 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1662 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1663 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1664 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1665 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1666 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1667
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1668 /* 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
1669 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
1670
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1671 if (!just_this_one)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1672 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1673 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1674 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1675 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
1676 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1677 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1678 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1679 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1680 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1681 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1682 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1684 /* POINT refers normally to the selected window.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1685 For any other window, set up appropriate value. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1686
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1687 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1688 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1689 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
1690 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1691 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1692 new_pt = BEGV;
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1693 Fset_marker (w->pointm, make_number (new_pt), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1694 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1695 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1696 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1697 new_pt = ZV;
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1698 Fset_marker (w->pointm, make_number (new_pt), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1700 /* 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
1701 BUF_PT (current_buffer) = new_pt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1703
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1704 /* 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
1705 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
1706 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
1707 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
1708 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
1709 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
1710 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1711 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
1712
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1713 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
1714 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
1715 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1716 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
1717 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
1718 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1719 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
1720 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1721 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1722
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1725 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1726
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727 startp = marker_position (w->start);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1729 /* 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
1730 check whether it can be used. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1731 if (!NILP (w->optional_new_start))
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1732 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1733 w->optional_new_start = Qnil;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1734 /* 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
1735
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1736 pos = *compute_motion (startp, 0,
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1737 (((EQ (window, minibuf_window)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1738 && startp == BEG)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1739 ? minibuf_prompt_width : 0)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1740 + (hscroll ? 1 - hscroll : 0)),
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1741 0,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1742 PT, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1743 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1744 Fpos_visible_in_window_p (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1745 - (1 << (BITS_PER_SHORT - 1)),
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1746 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
1747 /* 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
1748 so do so by setting force_start. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1749 if (pos.bufpos == PT)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1750 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1751 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1752
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1753 /* 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
1754 unless the specified location is outside the accessible range. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1755 if (!NILP (w->force_start))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1757 w->force_start = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1758 /* 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
1759 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
1760 /* 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
1761 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
1762 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1763 /* 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
1764 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
1765 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
1766 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
1767 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1768 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1769 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1770 Lisp_Object temp[3];
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1771
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1772 set_buffer_temp (old);
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
1773 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
1774 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1775 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
1776 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1777 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1778 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
1779 make_number (startp));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1780 startp = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1781 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1782 }
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1783 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1784 XSETFASTINT (w->last_overlay_modified, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1785 if (startp < BEGV) startp = BEGV;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1786 if (startp > ZV) startp = ZV;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1787 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1788 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1789 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1790 /* If point does not appear, move point so it does appear */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1791 pos = *compute_motion (startp, 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1792 (((EQ (window, minibuf_window)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1793 && startp == BEG)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1794 ? minibuf_prompt_width : 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1795 + (hscroll ? 1 - hscroll : 0)),
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1796 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1797 ZV, height / 2,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1798 - (1 << (BITS_PER_SHORT - 1)),
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1799 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
1800 BUF_PT (current_buffer) = pos.bufpos;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1801 if (w != XWINDOW (selected_window))
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1802 Fset_marker (w->pointm, make_number (PT), Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1803 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1804 {
5340
fcd6e0da3380 (redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents: 5230
diff changeset
1805 if (current_buffer == old)
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1806 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
1807 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1808 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1809 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1810 }
9218
db4473eb2265 (redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents: 9104
diff changeset
1811 /* 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
1812 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
1813 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
1814 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1815 {
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1816 cancel_my_columns (XWINDOW (window));
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1817 try_window (window, startp);
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1818 }
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 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1821 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823 /* 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
1824 and it has not moved off the frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1826 /* This code is not used for minibuffer for the sake of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1827 the case of redisplaying to replace an echo area message;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 since in that case the minibuffer contents per se are usually unchanged.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829 This code is of no real use in the minibuffer since
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 the handling of this_line_bufpos, etc.,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831 in redisplay handles the same cases. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 if (XFASTINT (w->last_modified) >= MODIFF
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1834 && 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
1835 && 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
1836 && (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
1837 /* 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
1838 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
1839 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
1840 && 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
1841 /* 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
1842 && !(!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
1843 && 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
1844 /* 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
1845 && 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
1846 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height)
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1847 && !EQ (window, minibuf_window)
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
1848 && (!MARKERP (Voverlay_arrow_position)
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
1849 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 {
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
1851 /* All positions in this clause are relative to the window edge. */
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
1852
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1853 int this_scroll_margin = scroll_margin;
19225
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
1854 int last_point_y = XFASTINT (w->last_point_y) - XINT (w->top);
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
1855 int last_point_x = (XFASTINT (w->last_point_x) - WINDOW_LEFT_MARGIN (w));
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1856
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1857 /* Find where PT is located now on the frame. */
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
1858 /* Check just_this_one as a way of verifying that the
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
1859 window edges have not changed. */
19225
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
1860 if (PT == XFASTINT (w->last_point) && just_this_one)
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1861 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
1862 pos.hpos = last_point_x;
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
1863 pos.vpos = last_point_y;
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1864 pos.bufpos = PT;
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1865 }
19225
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
1866 else if (PT > XFASTINT (w->last_point)
19478
b2544c0eada8 (redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents: 19375
diff changeset
1867 && XFASTINT (w->last_point) > startp && just_this_one
b2544c0eada8 (redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents: 19375
diff changeset
1868 /* We can't use this if point is in the left margin of a
b2544c0eada8 (redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents: 19375
diff changeset
1869 hscrolled window, because w->last_point_x has been
b2544c0eada8 (redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents: 19375
diff changeset
1870 clipped to the window edges. */
b2544c0eada8 (redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents: 19375
diff changeset
1871 && !(last_point_x <= 0 && hscroll))
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1872 {
19225
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
1873 pos = *compute_motion (XFASTINT (w->last_point),
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
1874 last_point_y, last_point_x, 0,
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1875 PT, height,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1876 /* BUG FIX: See the comment of
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1877 Fpos_visible_in_window_p (window.c). */
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1878 - (1 << (BITS_PER_SHORT - 1)),
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1879 width, hscroll,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1880 pos_tab_offset (w, startp), w);
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1881 }
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1882 else
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1883 {
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1884 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), 0,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1885 PT, height,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1886 /* BUG FIX: See the comment of
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1887 Fpos_visible_in_window_p (window.c). */
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1888 - (1 << (BITS_PER_SHORT - 1)),
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1889 width, hscroll,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1890 pos_tab_offset (w, startp), w);
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
1891 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1893 /* 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
1894 if (this_scroll_margin < 0)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1895 this_scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1896
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1897 if (XINT (w->height) < 4 * scroll_margin)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1898 this_scroll_margin = XINT (w->height) / 4;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1899
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1900 /* 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
1901 we are ok. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1902 if (pos.vpos < height - this_scroll_margin
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
1903 && (pos.vpos >= this_scroll_margin || startp == BEGV))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1904 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1905 /* Ok, point is still on frame */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1906 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 /* 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
1909 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1910 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1911 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
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 /* 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
1914 this one must be redisplayed, this does nothing because there
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1915 is nothing in DesiredFrame yet, and then the other window is
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 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
1917 if (WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1918 preserve_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919 */
20130
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1920 if (current_buffer->clip_changed
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1921 && ! NILP (Vwindow_scroll_functions))
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1922 run_hook_with_args_2 (Qwindow_scroll_functions, window,
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1923 make_number (marker_position (w->start)));
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1924
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1925 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1926 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 /* Don't bother trying redisplay with same start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1928 we already know it will lose */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1929 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1930 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1931 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1932 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
1933 && !(startp <= BEGV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1934 || FETCH_BYTE (startp - 1) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1936 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1937 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1938 else if (just_this_one && !MINI_WINDOW_P (w)
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1939 && PT >= startp
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1940 && 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
1941 /* 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
1942 && ! NILP (w->start_at_line_beg)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1943 && ! 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
1944 && do_id && !current_buffer->clip_changed
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1945 && !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
1946 && 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
1947 /* 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
1948 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1949 && !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
1950 /* 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
1951 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
1952 && !(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
1953 && NILP (w->region_showing)
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1954 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955 && EQ (last_arrow_string, Voverlay_arrow_string)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1956 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1957 && tem != -2)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1958 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959 /* tem > 0 means success. tem == -1 means choose new start.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 tem == -2 means try again with same start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 and nothing but whitespace follows the changed stuff.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1962 tem == 0 means try again with same start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1963 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1964 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966 else if (startp >= BEGV && startp <= ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1967 && (startp < ZV
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1968 /* Avoid starting at end of buffer. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1969 #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
1970 It will have to be considered later. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1971 || ! EQ (window, selected_window)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1972 /* Don't do the recentering if redisplay
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1973 is not for no user action. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1974 || preserve_echo_area
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1975 #endif
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1976 || startp == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1977 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1978 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1979 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1980 /* Try to redisplay starting at same place as before */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1981 /* If point has not moved off frame, accept the results */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1982 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1983 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1984 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1985 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1986 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1987 /* 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
1988 w->base_line_number = Qnil;
20130
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1989
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1990 if (current_buffer->clip_changed
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1991 && ! NILP (Vwindow_scroll_functions))
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1992 run_hook_with_args_2 (Qwindow_scroll_functions, window,
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1993 make_number (marker_position (w->start)));
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
1994
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1995 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1996 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1997 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1999 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2001 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
2002 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
2003 /* 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
2004 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2005 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2006 set_buffer_temp (old);
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
2007 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
2008 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2009 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2010 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012 /* Try to scroll by specified few lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2014 if (scroll_conservatively && !current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2015 && startp >= BEGV && startp <= ZV)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2016 {
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2017 int this_scroll_margin = scroll_margin;
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2018 int scroll_margin_pos;
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2019
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2020 /* 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
2021 if (this_scroll_margin < 0)
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2022 this_scroll_margin = 0;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2023
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2024 if (XINT (w->height) < 4 * this_scroll_margin)
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2025 this_scroll_margin = XINT (w->height) / 4;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2026
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2027 scroll_margin_pos = Z - XFASTINT (w->window_end_pos);
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2028 if (this_scroll_margin)
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2029 {
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2030 pos = *vmotion (scroll_margin_pos, -this_scroll_margin, w);
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2031 scroll_margin_pos = pos.bufpos;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2032 }
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2033 if (PT >= scroll_margin_pos)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2034 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2035 struct position pos;
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2036 pos = *compute_motion (scroll_margin_pos, 0, 0, 0,
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2037 PT, XFASTINT (w->height), 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2038 XFASTINT (w->width), XFASTINT (w->hscroll),
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2039 pos_tab_offset (w, startp), w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2040 if (pos.vpos > scroll_conservatively)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2041 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2042
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2043 pos = *vmotion (startp, pos.vpos + 1, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2044
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2045 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2046 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2047 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2048 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2049 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2050 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2051 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2052 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2053 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2054 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2055 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2056 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2057 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2058 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2059 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2060 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2061 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2062 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2063 }
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2064
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2065 scroll_margin_pos = startp;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2066 if (this_scroll_margin)
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2067 {
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2068 pos = *vmotion (scroll_margin_pos, this_scroll_margin, w);
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2069 scroll_margin_pos = pos.bufpos;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2070 }
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2071 if (PT < scroll_margin_pos)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2072 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2073 struct position pos;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2074 pos = *compute_motion (PT, 0, 0, 0,
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2075 scroll_margin_pos, XFASTINT (w->height), 0,
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2076 XFASTINT (w->width), XFASTINT (w->hscroll),
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2077 pos_tab_offset (w, startp), w);
19061
e2be10e9bf9d (redisplay_window): Fix one-off in handling
Richard M. Stallman <rms@gnu.org>
parents: 19045
diff changeset
2078 if (pos.vpos > scroll_conservatively)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2079 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2080
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2081 pos = *vmotion (startp, -pos.vpos, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2082
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2083 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2084 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2085 Fset_marker (w->start, make_number (pos.bufpos), Qnil);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2086 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2087 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2088 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2089 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2090 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2091 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2092 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2093 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2094 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2095 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2096 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2097 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2098 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2099 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2100 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2101 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2102 scroll_fail_1: ;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2103 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2104
13760
7c7cc29b994e (redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents: 13733
diff changeset
2105 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
2106 && startp >= BEGV && startp <= ZV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2108 if (PT > startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2110 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2111 if (pos.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112 goto scroll_fail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2113 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2114
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2115 pos = *vmotion (startp, (PT < startp ? - scroll_step : scroll_step), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2117 if (PT >= pos.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2118 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
2119 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2120 {
14988
c833cd83414c (redisplay_window): Move w->start marker before
Richard M. Stallman <rms@gnu.org>
parents: 14683
diff changeset
2121 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
2122 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
2123 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2124 pos.bufpos = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2125 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2128 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2129 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2130 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2131 /* 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
2132 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2133 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2134 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2135 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2138 scroll_fail: ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2139 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2140
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2141 /* Finally, just choose place to start which centers point */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2142
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2143 recenter:
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2144 /* 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
2145 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2146
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2147 pos = *vmotion (PT, - (height / 2), w);
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
2148 /* 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
2149 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
2150 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
2151 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2152 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2153 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
2154 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2155 pos.bufpos = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2156 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2157 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2158
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2159 startp = marker_position (w->start);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2160 w->start_at_line_beg
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2161 = (startp == BEGV || FETCH_BYTE (startp - 1) == '\n') ? Qt : Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2162
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2163 done:
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2164 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2165 /* 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
2166 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
2167 || (!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
2168 || 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
2169 || (!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
2170 && XFASTINT (w->column_number_displayed) != current_column ()))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2171 && height != XFASTINT (w->height))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2172 display_mode_line (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2173 if (! line_number_displayed
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2174 && ! BUFFERP (w->base_line_pos))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2175 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2176 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2177 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2178 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2180 /* 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
2181 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
2182 && (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
2183 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
2184 #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
2185 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
2186 #else
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2187 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
2188 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2189 : FRAME_MENU_BAR_LINES (f) > 0)
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2190 && EQ (FRAME_SELECTED_WINDOW (f), window))
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2191 display_menu_bar (w);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2192
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2193 finish_scroll_bars:
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2194 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
2195 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2196 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2197
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2198 /* 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
2199 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
2200 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
2201 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
2202 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2203
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2204 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
2205 if (! MINI_WINDOW_P (w)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2206 || (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
2207 {
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
2208 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2209 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
2210 /* 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
2211 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
2212 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
2213
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2214 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
2215 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
2216 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2217 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2218 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2219
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2220 /* 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
2221 (*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
2222
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2223 /* 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
2224 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
2225 (*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
2226 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2227
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
2228 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
2229 if (update_mode_line)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
2230 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
2231 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2232 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
2233 BUF_PT (current_buffer) = lpoint;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2234 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2235
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2236 /* Do full redisplay on one window, starting at position `pos'. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2238 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2239 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2241 register int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2243 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2244 register int height = window_internal_height (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2245 register int vpos = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2246 register int last_text_vpos = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2247 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
2248 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2249 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2250
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2251 /* 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
2252 if (pos < XBUFFER (w->buffer)->begv
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2253 || pos > XBUFFER (w->buffer)->zv)
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2254 abort ();
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2255
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2256 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2257 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2258 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2259 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2260 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
2261 val.ovstring_chars_done = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2262 val.tab_offset = pos_tab_offset (w, pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2264 while (--height >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2265 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2266 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
2267 val.ovstring_chars_done);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2268 /* 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
2269 in VAL. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2270 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2271 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2272 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2273 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2274 vpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2275 if (pos != val.bufpos)
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2276 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2277 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
2278 #ifdef USE_TEXT_PROPERTIES
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2279 Lisp_Object invis_prop;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2280 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
2281 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
2282 #endif
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2283
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2284 last_text_vpos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2285 /* 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
2286 = vpos - (val.vpos
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2287 && (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
2288 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2289 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2290 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2291
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2292 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2293 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2294 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2295 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2296
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2297 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2298 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2299 && Z != pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2302 /* 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
2303 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
2304 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2305 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2306 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2307 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2308
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2309 /* Try to redisplay when buffer is modified locally,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2310 computing insert/delete line to preserve text outside
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2311 the bounds of the changes.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2312 Return 1 if successful, 0 if if cannot tell what to do,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313 or -1 to tell caller to find a new window start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2314 or -2 to tell caller to do normal redisplay with same window start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2315
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2316 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2317 try_window_id (window)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2318 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2319 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2320 int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 register int height = window_internal_height (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2323 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 int top = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325 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
2326 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2329 int did_motion;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2330 register int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2331 register int i, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332 int last_text_vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 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
2334 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
2335 ? 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
2336 : !NILP (current_buffer->selective_display) ? -1 : 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2338 struct position val, bp, ep, xp, pp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 int scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340 int delta;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2341 int epto, old_tick;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2343 if (GPT - BEG < beg_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 beg_unchanged = GPT - BEG;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2345 if (Z - GPT < end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2346 end_unchanged = Z - GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2347
5739
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
2348 if (beg_unchanged + BEG < start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2349 return 0; /* Give up if changes go above top of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2350
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2351 /* Find position before which nothing is changed. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2352 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
2353 min (ZV, beg_unchanged + BEG), height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2354 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2355 Fpos_visible_in_window_p() (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2356 - (1 << (BITS_PER_SHORT - 1)),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2357 width, hscroll, pos_tab_offset (w, start), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2358 if (bp.vpos >= height)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2359 {
11111
e3022a32d11d (try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents: 11108
diff changeset
2360 if (PT < bp.bufpos)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2361 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
2362 /* 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
2363 We don't need to change the text at all.
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2364 But we need to update window_end_pos to account for
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2365 any change in buffer size. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2366 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
2367 ZV, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2368 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2369 Fpos_visible_in_window_p() (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2370 - (1 << (BITS_PER_SHORT - 1)),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2371 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
2372 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
2373 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
2374 goto findpoint;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2375 }
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2376 return 0;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2377 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2378
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2379 vpos = bp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2380
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2381 /* Find beginning of that frame line. Must display from there. */
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2382 bp = *vmotion (bp.bufpos, 0, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2383
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2384 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2385 val.hpos = lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2386 if (pos < start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2387 return -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2388
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2389 did_motion = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2390 /* 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
2391 really start with previous frame line, in case it was not
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2392 continued when last redisplayed */
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2393 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2394 ||
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2395 /* 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
2396 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2397 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2398 bp = *vmotion (bp.bufpos, -1, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2399 --vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2400 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2401 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2402 val.tab_offset = bp.tab_offset; /* Update tab offset. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2403
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2404 if (bp.contin && bp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2405 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2406 val.hpos = bp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2407 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
2408 did_motion = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2409 DEC_POS (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2410 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2411
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2412 bp.vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2413
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2414 /* Find first visible newline after which no more is changed. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2415 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
2416 if (selective > 0)
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
2417 while (tem < ZV - 1 && (indented_beyond_p (tem, selective)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2418 tem = find_next_newline (tem, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2419
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2420 /* Compute the cursor position after that newline. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2421 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
2422 height, - (1 << (BITS_PER_SHORT - 1)),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2423 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2424 /* 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
2425 val.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2427 /* If changes reach past the text available on the frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2428 just display rest of frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2429 if (ep.bufpos > Z - XFASTINT (w->window_end_pos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2430 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 stop_vpos = ep.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2433
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2434 /* If no newline before ep, the line ep is on includes some changes
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2435 that must be displayed. Make sure we don't stop before it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2436 /* Also, if changes reach all the way until ep.bufpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2437 it is possible that something was deleted after the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438 newline before it, so the following line must be redrawn. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2439 if (stop_vpos == ep.vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2440 && (ep.bufpos == BEGV
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2441 || FETCH_BYTE (ep.bufpos - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 || ep.bufpos == Z - end_unchanged))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443 stop_vpos = ep.vpos + 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2444
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2445 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2446 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2447 zv_strings_seen = 0;
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 /* If changes do not reach to bottom of window,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 figure out how much to scroll the rest of the window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451 if (stop_vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 /* 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
2454 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2455 Z - XFASTINT (w->window_end_pos),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2456 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2457 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2458 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2459 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2460 width, hscroll, ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2461 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2462
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2463 /* Is everything on frame below the changes whitespace?
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2464 If so, no scrolling is really necessary. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2465 for (i = ep.bufpos; i < xp.bufpos; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2466 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2467 tem = FETCH_BYTE (i);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2468 if (tem != ' ' && tem != '\n' && tem != '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2469 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 if (i == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473
9330
28fcacb58a38 (try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9325
diff changeset
2474 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
2475 XFASTINT (w->window_end_vpos) + scroll_amount);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2477 /* 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
2478 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2479 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2480 if (PT <= xp.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2482 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
2483 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
2484 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2485 /* 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
2486 ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2489 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2490 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
2491 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
2492 width, hscroll,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2493 /* 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
2494 xp.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2495 }
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2496 if (pp.bufpos < PT || pp.vpos == height)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2497 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2498 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
2499 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2500 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2501
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2502 if (stop_vpos - scroll_amount >= height
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2503 || ep.bufpos == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2504 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2505 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2506 stop_vpos -= scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2507 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2508 /* In this path, we have altered window_end_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2509 and not left it negative.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2510 We must make sure that, in case display is preempted
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2511 before the frame changes to reflect what we do here,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2512 further updates will not come to try_window_id
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2513 and assume the frame and window_end_vpos match. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2514 blank_end_of_window = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2516 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
2517 {
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
2518 /* 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
2519 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
2520 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
2521 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
2522 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
2523 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
2524 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2525 else if (bp.bufpos == Z - end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2527 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528 don't bother scrolling. Can happen if lines are short. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2529 if (scroll_cost (f, bp.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2531 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2532 > xp.bufpos - bp.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2533 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2536 /* If pure deletion, scroll up as many lines as possible.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2537 In common case of killing a line, this can save the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2538 following line from being overwritten by scrolling
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2539 and therefore having to be redrawn. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2540 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
2541 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
2542 scroll_amount, bp.bufpos);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2543 if (!tem)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2544 stop_vpos = height;
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2545 else
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2546 {
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2547 /* 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
2548 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
2549 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
2550 (This can happen in a deletion that ends in mid-line.)
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2551 To adjust properly, we need to make things consistent
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2552 at the position ep.
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2553 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
2554 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
2555 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
2556 int oldstart
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2557 = 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
2558 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
2559 ep.bufpos - oldstart);
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2560 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2561 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 else if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565 don't bother scrolling. Can happen if lines are short. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2567 overestimate of cost of reprinting, since xp.bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2568 would end up below the bottom of the window. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2569 if (scroll_cost (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2570 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2571 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 > xp.bufpos - ep.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 return -2;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2576 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 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
2578 scroll_amount, ep.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 if (!tem) stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2580 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2582
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2583 /* In any case, do not display past bottom of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2584 if (stop_vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2587 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2589
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 /* Handle case where pos is before w->start --
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2591 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
2592 if (vpos == 0 && pos < marker_position (w->start))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2593 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2594
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2595 /* Redisplay the lines where the text was changed */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2596 last_text_vpos = vpos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2597 /* 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
2598 val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2599 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2600 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2601 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2602 to account for passing the line that that character really starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2603 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2604 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2605 #endif /* 0 */
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2606 old_tick = MODIFF;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2607 while (vpos < stop_vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2608 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2609 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
2610 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
2611 /* 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
2612 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
2613 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
2614 if (old_tick != MODIFF)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2615 stop_vpos = height;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2616 /* 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
2617 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2618 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2619 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2620 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2621 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2622 if (pos != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2623 last_text_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2624 /* 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
2625 = vpos - (val.vpos && FETCH_BYTE (val.bufpos - 1) != '\n');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2626 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2627 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2628
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2629 /* There are two cases:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2630 1) we have displayed down to the bottom of the window
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2631 2) we have scrolled lines below stop_vpos by scroll_amount */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633 if (vpos == height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2634 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2635 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2636 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2637 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2638 val.bufpos++;
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2639 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
2640 XSETFASTINT (w->window_end_pos, Z - val.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2642
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2643 /* If scrolling made blank lines at window bottom,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2644 redisplay to fill those lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2645 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2646 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2647 /* Don't consider these lines for general-purpose scrolling.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2648 That will save time in the scrolling computation. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2649 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2650 vpos = xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2651 pos = xp.bufpos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2652 val.hpos = xp.hpos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2653 val.tab_offset = xp.tab_offset;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2654 if (pos == ZV)
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2655 { /* Display from next line */
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2656 vpos = height + scroll_amount;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2657 val.hpos = lmargin;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2658 val.tab_offset = 0;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2659 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2660 else if (xp.contin && xp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 val.hpos = xp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2663 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
2664 DEC_POS (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2665 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2666
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2667 blank_end_of_window = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2668 /* 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
2669 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2670 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2671 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2672 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2673 to account for passing the line that that character starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2674 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2675 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2676 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2677 while (vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2678 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2679 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
2680 val.tab_offset, val.ovstring_chars_done);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2681 /* 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
2682 offset in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2683 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2684 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2685 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2686 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2687 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2688 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2689
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2690 /* Here is a case where display_text_line sets cursor_vpos wrong.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2691 Make it be fixed up, below. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2692 if (xp.bufpos == ZV
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2693 && xp.bufpos == PT)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2694 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2695 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2696
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2697 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2698 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2699 && Z != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2700 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2701
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2702 /* Attempt to adjust end-of-text positions to new bottom line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2703 if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2704 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2705 delta = height - xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2706 if (delta < 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2707 || (delta > 0 && xp.bufpos <= ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2708 || (delta == 0 && xp.hpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2709 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2710 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
2711 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
2712 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
2713 XFASTINT (w->window_end_vpos) + val.vpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2714 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2715 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2716
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2717 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2718
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2719 /* If point was not in a line that was displayed, find it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2720 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2721 {
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2722 findpoint:
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2723 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
2724 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2725 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2726 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2727 1 << (BITS_PER_SHORT - 1),
6692
43a79400a664 Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 6684
diff changeset
2728 width, hscroll, pos_tab_offset (w, start), w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2729 /* Admit failure if point is off frame now */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2730 if (val.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2731 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2732 for (vpos = 0; vpos < height; vpos++)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2733 cancel_line (vpos + top, f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2734 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2735 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736 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
2737 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2738 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2739
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2740 FRAME_CURSOR_X (f) = cursor_hpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2741 FRAME_CURSOR_Y (f) = cursor_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2742
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2743 if (debug_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2745 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
2746 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
2747 width, hscroll, pos_tab_offset (w, start), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2748 if (val.vpos != XFASTINT (w->window_end_vpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2749 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2750 if (XFASTINT (w->window_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2751 != Z - val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2752 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2753 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2754
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2755 return 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2756 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2757
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2758 /* Copy LEN glyphs starting address FROM to the rope TO.
301
2fb0312f83c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 277
diff changeset
2759 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
2760 Value is TO, advanced past the copied data.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2761 F is the frame we are displaying in. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2762
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2763 static GLYPH *
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2764 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
2765 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2766 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
2767 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
2768 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
2769 int len;
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2770 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
2771 {
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2772 int n = len;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2773 register Lisp_Object *fp = from;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2774 /* 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
2775 int last_code = -1;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2776 int last_merged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2777
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
2778 #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
2779 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
2780 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
2781 {
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2782 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
2783 int facecode;
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2784 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
2785
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
2786 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
2787 /* 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
2788 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
2789
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2790 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
2791 /* 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
2792 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
2793 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
2794 /* 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
2795 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
2796 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2797 {
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2798 /* 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
2799 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
2800 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
2801 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2802
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2803 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
2804 *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
2805 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2806 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2807 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2808 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2809 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2810 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
2811 {
6741
840862375e93 (copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents: 6740
diff changeset
2812 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
2813 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2814 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2815 }
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2816 return to;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2817 }
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2818
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2819 /* 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
2820 with a displayable computed face code. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2821
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2822 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
2823 fix_glyph (f, glyph, cface)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2824 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2825 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
2826 int cface;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
2827 {
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
2828 #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
2829 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
2830 {
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
2831 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
2832 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
2833 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
2834 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2835 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
2836 return glyph;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2837 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2838
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2839 /* 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
2840
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2841 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
2842 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
2843 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
2844 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
2845 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
2846 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
2847 account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2848
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2849 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2850
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2851 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
2852 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
2853
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2854 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
2855 the top of the frame, not W.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2856
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2857 Returns a STRUCT POSITION giving character to start next line with
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2858 and where to display it, including a zero or negative hpos.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2859 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
2860
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2861 struct position val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2862
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2863 static struct position *
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2864 display_text_line (w, start, vpos, hpos, taboffset, ovstr_done)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2865 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2866 int start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2867 int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2868 int hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2869 int taboffset;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
2870 int ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2871 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2872 register int pos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2873 register int c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2874 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2875 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2876 register unsigned char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2877 GLYPH *endp;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2878 register GLYPH *leftmargin;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2879 register GLYPH *p1prev;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2880 register GLYPH *p1start;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2881 int prevpos;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2882 int *charstart;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2883 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2884 int tab_width = XINT (current_buffer->tab_width);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2885 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
2886 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2887 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2888 int lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2889 int invis;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2890 int last_invis_skip = 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2891 Lisp_Object last_invis_prop;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2892 int hscroll = XINT (w->hscroll);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2893 int truncate = (hscroll
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2894 || (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
2895 && !WINDOW_FULL_WIDTH_P (w))
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2896 || !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
2897
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2898 /* 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
2899 int highlight_region
16069
8fe5e69de92a (redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
2900 = (!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
2901 && (XWINDOW (current_buffer->last_selected_window) == w
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
2902 || highlight_nonselected_windows));
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2903 int region_beg, region_end;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2904
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
2905 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
2906 ? 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
2907 : !NILP (current_buffer->selective_display) ? -1 : 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2908 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
2909 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
2910
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2911 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
2912 /* 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
2913 if it calls for an ellipsis.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2914 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
2915 selective display is enabled--you must check that separately. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2916 int selective_rlen
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2917 = (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
2918 ? 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
2919 : !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
2920 /* 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
2921 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
2922 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
2923 = (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
2924 ? 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
2925 : default_invis_vector);
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2926
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
2927 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
2928 || !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
2929 ? '$' : 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
2930 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
2931 || !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
2932 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2933
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2934 /* If 1, we must handle multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2935 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
2936 /* Length of multibyte form of each character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2937 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2938 /* 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
2939 displayed from right to left. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2940 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
2941 ? 0 : GLYPH_MASK_REV_DIR);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2942
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2943 /* 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
2944 to overlays or text property changes. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2945 int next_face_change;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2946
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2947 /* 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
2948 overlay starts or ends. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2949 int next_boundary;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2950
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2951 /* 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
2952 int current_face = 0;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
2953 int i;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2954
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2955 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
2956 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
2957
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
2958 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
2959 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2960
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2961 /* 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
2962 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
2963 /* 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
2964 && (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
2965 || w == XWINDOW (selected_window)))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2966 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2967 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
2968 if (PT < region_beg)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2969 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2970 region_end = region_beg;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2971 region_beg = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2972 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2973 else
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2974 region_end = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2975 w->region_showing = Qt;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2976 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2977 else
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
2978 {
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
2979 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
2980 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
2981 }
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2982
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
2983 if (MINI_WINDOW_P (w)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2984 && start == BEG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2985 && vpos == XFASTINT (w->top))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2986 {
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
2987 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
2988 {
18994
015e9d877871 (display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents: 18865
diff changeset
2989 int old_width = minibuf_prompt_width;
015e9d877871 (display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents: 18865
diff changeset
2990
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
2991 minibuf_prompt_width
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
2992 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data,
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
2993 XSTRING (minibuf_prompt)->size,
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
2994 hpos + WINDOW_LEFT_MARGIN (w),
9756
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2995 /* 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
2996 ' ',
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2997 1, -1,
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
2998 /* 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
2999 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
3000 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
3001 (XFASTINT (w->width) > 10
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3002 ? XFASTINT (w->width) - 4 : -1),
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3003 -1)
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3004 - hpos - WINDOW_LEFT_MARGIN (w));
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3005 hpos += minibuf_prompt_width;
18994
015e9d877871 (display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents: 18865
diff changeset
3006 taboffset -= minibuf_prompt_width - old_width;
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3007 }
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3008 else
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3009 minibuf_prompt_width = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3012 /* 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
3013 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
3014 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
3015 if (hpos < 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3016 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3017 struct position *left_edge
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3018 = compute_motion (pos, vpos, hpos, 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3019 ZV, vpos, 0,
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3020 width, hscroll, taboffset, w);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3021
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3022 /* 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
3023 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
3024 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
3025 the left margin.
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3026
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3027 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
3028 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
3029 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
3030 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
3031 || left_edge->hpos > 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3032 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3033 pos = left_edge->bufpos;
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
3034 /* 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
3035 can decrease POS by 1. */
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
3036 pos--;
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3037 hpos = left_edge->prevhpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3038 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3039 else
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3040 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3041 pos = left_edge->bufpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3042 hpos = left_edge->hpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3043 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3044 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3045
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3046 hpos += WINDOW_LEFT_MARGIN (w);
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3047
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3048 desired_glyphs->bufp[vpos] = start;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3049 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
3050 p1start = p1;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3051 charstart = desired_glyphs->charstarts[vpos] + hpos;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3052 /* 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
3053 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
3054 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
3055 endp = leftmargin + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3056
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
3057 /* 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
3058 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
3059 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
3060 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
3061 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
3062 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
3063
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3064 /* Loop generating characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3065 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
3066 if reach or pass continuation column,
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3067 or at face change. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3068 pause = pos;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3069 next_face_change = pos;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3070 next_boundary = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3071 p1prev = p1;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3072 prevpos = pos;
18829
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3073
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3074 /* If the window is hscrolled and point is in the invisible part of the
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3075 current line beyond the left margin we can record the cursor location
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3076 right away. */
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3077 if (hscroll && start <= PT && PT < pos && cursor_vpos < 0)
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3078 {
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3079 cursor_vpos = vpos;
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3080 cursor_hpos = p1 - leftmargin;
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3081 }
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3082
18730
492cb3baf591 (display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents: 18718
diff changeset
3083 while (p1 < endp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3084 {
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3085 if (pos >= pause)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3086 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3087 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
3088
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3089 while (pos == next_boundary)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3090 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3091 Lisp_Object position, limit, prop, ww;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3092
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3093 /* 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
3094 and have already displayed the appropriate strings
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3095 on an earlier line. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3096 if (pos < ZV || !zv_strings_seen++)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3097 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3098 int ovlen;
16245
d960549d163c (display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 16197
diff changeset
3099 unsigned char *ovstr;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3100 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
3101
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3102 if (ovlen > 0)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3103 {
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3104 /* 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
3105 ovstr += ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3106 ovlen -= ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3107
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3108 while (ovlen > 0)
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3109 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3110 int charset, cols;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3111 GLYPH g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3112
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3113 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3114 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3115 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
3116 ovstr += len, ovlen -= len, ovstr_done += len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3117 charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3118 cols = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3119 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3120 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3121 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3122 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3123 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3124 c = *ovstr++, ovlen--, ovstr_done++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3125 cols = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3126 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3127 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
3128 while (cols-- > 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3129 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3130 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3131 *p1 = g, g |= GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3132 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3133 }
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3134 }
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3135 /* 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
3136 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
3137 just for neatness' sake. */
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3138 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
3139 ovstr_done = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3140 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3141 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3142
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3143 /* Did we reach point? Record the cursor location. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3144 if (pos == PT && cursor_vpos < 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3145 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3146 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3147 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3148 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3149
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3150 if (pos >= ZV)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3151 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3152
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3153 XSETFASTINT (position, pos);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3154 limit = Fnext_overlay_change (position);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3155 #ifdef USE_TEXT_PROPERTIES
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3156 /* This is just an estimate to give reasonable
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3157 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
3158 if (XFASTINT (limit) > pos + 50)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3159 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3160 int limitpos = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3161 if (limitpos < Z)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3162 INC_POS (limitpos); /* Adjust to character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3163 XSETFASTINT (limit, limitpos);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3164 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3165 limit = Fnext_single_property_change (position, Qinvisible,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3166 Fcurrent_buffer (), limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3167 #endif
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3168 next_boundary = XFASTINT (limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3169 /* 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
3170 the next property change. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3171 XSETWINDOW (ww, w);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3172 prop = Fget_char_property (position, Qinvisible, ww);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3173 if (TEXT_PROP_MEANS_INVISIBLE (prop))
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3174 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3175 if (pos < PT && next_boundary >= PT)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3176 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3177 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3178 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3179 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3180 pos = next_boundary;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3181 last_invis_skip = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3182 last_invis_prop = prop;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3183 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3184 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3185
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3186 /* Did we reach point? Record the cursor location. */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3187 if (pos == PT && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3188 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3189 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3190 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3192
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3193 /* 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
3194 Stop here. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3195 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
3196 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3197 /* 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
3198 /* 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
3199 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
3200 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3201 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
3202 ? leftmargin : p1)
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3203 - p1start];
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3204 *p2x++ = pos;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3205 }
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3206 break;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3207 }
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
3208
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3209 /* 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
3210 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
3211 if (MARKERP (w->redisplay_end_trigger)
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3212 && 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
3213 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
3214 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
3215 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
3216 else
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3217 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
3218
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3219 /* 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
3220 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
3221 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
3222 {
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3223 Lisp_Object args[3];
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3224
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3225 args[0] = Qredisplay_end_trigger_functions;
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3226 XSETWINDOW (args[1], w);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3227 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
3228
7167b8612c52 (display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents: 14036
diff changeset
3229 /* 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
3230 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
3231 w->redisplay_end_trigger = Qnil;
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3232 Frun_hook_with_args (3, args);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3233
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3234 e_t_h = ZV;
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3235 /* 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
3236 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
3237 }
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3238
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3239 #ifdef HAVE_FACES
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3240 /* 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
3241 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
3242 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
3243 if (pos >= next_face_change
91662157e604 (redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents: 15245
diff changeset
3244 && (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
3245 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3246 int limit = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3247
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3248 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
3249 INC_POS (limit); /* Adjust to character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3250 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
3251 region_beg, region_end,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3252 &next_face_change, limit, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3253 }
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3254 #endif
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3255
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3256 /* 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
3257 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
3258
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3259 pause = ZV;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3260
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3261 if (pos < next_boundary && next_boundary < pause)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3262 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
3263 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
3264 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
3265
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3266 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
3267 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
3268
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3269 /* 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
3270 the phone? */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3271 if (pos < PT && PT < pause)
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3272 pause = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3273 if (pos < GPT && GPT < pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3274 pause = GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3275
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3276 p = POS_ADDR (pos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3277 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3278
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3279 if (p1 >= endp)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3280 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3281
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3282 p1prev = p1;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3283
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3284 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3285 /* PAUSE is surely at character boundary. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3286 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
3287 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3288 c = *p++, len = 1;
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3289 /* 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
3290 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
3291 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3292 p1 = copy_part_of_rope (f, p1, leftmargin,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3293 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3294 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
3295 current_face, rev_dir_bit);
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3296 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3297 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3299 if (p1 >= leftmargin)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3300 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3301 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3302 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3303 else if (c == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3304 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3305 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3306 /* 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
3307 (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
3308 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
3309 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3310
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3311 invis = 0;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3312 if (last_invis_skip == pos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3313 && 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
3314 invis = 1;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3315 while (pos + 1 < ZV
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3316 && selective > 0
5942
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
3317 && indented_beyond_p (pos + 1, selective))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3318 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3319 invis = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3320 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
3321 if (FETCH_BYTE (pos - 1) == '\n')
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3322 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3323 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3324 if (invis && selective_rlen > 0 && p1 >= leftmargin)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3325 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3326 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3327 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
3328
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3329 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
3330 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3331
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3332 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3333 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3334 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
3335
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3336 #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
3337 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
3338 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
3339 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
3340 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
3341 *cs++ = -2;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3342 /* 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
3343 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
3344 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
3345 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3346
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3347 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
3348 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3349 }
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3350
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3351 /* 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
3352 /* 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
3353 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
3354 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3355 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3356 /* 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
3357 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
3358 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
3359 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3360 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3361 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3362 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
3363
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3364 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3365 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3366 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3367 }
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3368 #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
3369 /* 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
3370 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
3371 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
3372 {
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3373 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
3374 p1 = leftmargin;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3375 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
3376 *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
3377 }
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3378 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3379
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3380 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3381 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3382 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3383 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3384 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3385 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3386 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3387 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3388 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3389 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3390 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3391 % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3393 else if (c == Ctl ('M') && selective == -1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395 pos = find_next_newline (pos, 1);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3396 if (FETCH_BYTE (pos - 1) == '\n')
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3397 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3398 if (selective_rlen > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3399 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3400 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3401 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3402 p1 = endp;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3403 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
3404 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3405 }
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3406 #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
3407 /* 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
3408 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
3409 if (current_face)
7772
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3410 {
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3411 if (p1 < leftmargin)
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3412 p1 = leftmargin;
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3413 while (p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3414 *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
3415 }
2884
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
3416 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3417
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3418 /* 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
3419 /* 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
3420 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
3421 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3422 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3423 /* 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
3424 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
3425 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
3426 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3427 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3428 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3429 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
3430
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3431 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3432 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3433 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3434 }
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3435 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3436 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3437 else if (c < 0200 && ctl_arrow)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3438 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3439 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
3440 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3441 (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
3442 && 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
3443 ? 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
3444 current_face)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3445 | rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3446 p1++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3447 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3448 *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
3449 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3450 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3451 else if (len == 1)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3452 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3453 /* C is not a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3454 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
3455 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3456 (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
3457 && 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
3458 ? 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
3459 current_face)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3460 | rev_dir_bit);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3461 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3462 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3463 *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
3464 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3465 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3466 *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
3467 | rev_dir_bit);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3468 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3469 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3470 *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3471 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3472 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3473 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3474 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3475 /* C is a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3476 int charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3477 int columns = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3478 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3479 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3480 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
3481
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3482 while (columns--)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3483 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3484 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3485 *p1 = g, g |= GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3486 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3487 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3488 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3489
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3490 prevpos = pos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3491 pos += len;
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3492
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3493 /* 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
3494
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3495 /* 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
3496 if (p1 >= leftmargin)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3497 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3498 /* 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
3499 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
3500 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
3501 if (p1 != p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3502 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3503 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3504 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3505 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3506 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
3507
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3508 if (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3509 *p2x++ = prevpos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3510 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3511 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3512 }
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3513 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3514 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3515
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3516 val.hpos = - XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3517 if (val.hpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3518 val.hpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3519
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3520 val.vpos = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3521
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3522 lastpos = pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3523
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3524 /* 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
3525 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
3526 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
3527 /* 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
3528 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
3529 internal width. */
7292
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3530 i = p1 - p1start + 1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3531 if (p1 < leftmargin)
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3532 i += leftmargin - p1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3533 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
3534 charstart[i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3535
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3536 /* Handle continuation in middle of a character */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3537 /* by backing up over it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3538 if (p1 > endp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3539 {
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3540 /* 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
3541 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
3542 if (p1prev)
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3543 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3544 /* 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
3545 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
3546 LEN. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3547 pos = prevpos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3548
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3549 if (len == 1)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3550 /* 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
3551 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
3552 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
3553 line. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3554 val.hpos += p1prev - endp;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3555 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3556 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3557 /* 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
3558 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
3559 into the next line. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3560 /* 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
3561 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
3562 must be adjusted. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3563 taboffset = taboffset + (p1prev - endp);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3564 /* 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
3565 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3566 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
3567 while (p1prev < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3568 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3569 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3570 /* 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
3571 lastpos = pos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3572 if (PT == pos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3573 cursor_vpos = -1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3574 }
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3575 }
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3576
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3577 /* Keep in this line everything up to the continuation column. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3578 p1 = endp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3579 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3580
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3581 /* Finish deciding which character to start the next line on,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3582 and what hpos to start it at.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3583 Also set `lastpos' to the last position which counts as "on this line"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3584 for cursor-positioning. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3585
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3586 if (pos < ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3587 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3588 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
3589 {
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3590 /* 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
3591 pos++;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3592 val.tab_offset = 0;
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3593 /* 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
3594 at the right margin. */
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3595 while (pos < ZV && selective > 0
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3596 && indented_beyond_p (pos, selective))
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3597 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
3598 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3599 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3600 /* Stopped due to right margin of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3601 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3602 if (truncate)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3603 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3604 *p1++ = fix_glyph (f, truncator, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3605 /* Truncating => start next line after next newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3606 and point is on this line if it is before the newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3607 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
3608 do
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3609 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
3610 while (pos < ZV && selective > 0
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3611 && indented_beyond_p (pos, selective));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3612 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3613
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3614 lastpos = pos - (FETCH_BYTE (pos - 1) == '\n');
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3615 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3616 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3617 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3618 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3619 *p1++ = fix_glyph (f, continuer, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3620 val.vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3621 lastpos--;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3622 val.tab_offset = taboffset + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3623 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3625 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3626 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3627 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3628
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3629 /* 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
3630 record its frame location now. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3631
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3632 if (start <= PT && PT <= lastpos && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3633 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3634 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3635 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3636 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3637
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3638 if (cursor_vpos == vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3639 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3640 if (cursor_hpos < 0) cursor_hpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3641 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
3642 cursor_hpos += WINDOW_LEFT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3643 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3644 {
11649
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3645 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
3646 && 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
3647 {
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3648 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
3649 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
3650 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3652 if (w == XWINDOW (selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3653 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3654 /* Line is not continued and did not start
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 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
3656 if ((hpos - WINDOW_LEFT_MARGIN (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3657 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3658 && val.vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3659 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3660 this_line_bufpos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3661 this_line_buffer = current_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3662 this_line_vpos = cursor_vpos;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
3663 this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3664 this_line_endpos = Z - lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3665 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3666 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3667 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3668 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3669 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3670 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3671
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3672 /* If hscroll and line not empty, insert truncation-at-left marker */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 if (hscroll && lastpos != start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3674 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3675 GLYPH g = fix_glyph (f, truncator, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3676 *leftmargin = g;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3677 if (p1 <= leftmargin)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3678 p1 = leftmargin + 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3679 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
3680 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3681 p1prev = leftmargin + 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3682 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3683 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3684 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3685 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3686
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3687 if (!WINDOW_RIGHTMOST_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3688 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3689 endp++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3690 if (p1 < leftmargin) p1 = leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3691 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
3692
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
3693 /* 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
3694 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
3695 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
3696 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
3697 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
3698 {
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3699 int i;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3700 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
3701 *p1++ = SPACEGLYPH;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3702 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3703 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
3704 *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
3705 ? XINT (DISP_BORDER_GLYPH (dp))
12921
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
3706 : '|');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3707 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3708 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3709 p1 - desired_glyphs->glyphs[vpos]);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3710 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3711
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3712 /* If the start of this line is the overlay arrow-position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3713 then put the arrow string into the display-line. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3714
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3715 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3716 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3717 && 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
3718 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3719 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3720 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3721 unsigned char *p = XSTRING (Voverlay_arrow_string)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3722 int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3723 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
3724 int arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3725
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3726 if (len > width)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3727 len = width;
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3728 #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
3729 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
3730 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3731 /* 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
3732 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
3733 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3734 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
3735 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
3736 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
3737
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
3738 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
3739 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
3740 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
3741 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
3742 }
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3743 }
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3744 else
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3745 #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
3746 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
3747 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
3748 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
3749 }
3726
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
3750
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
3751 /* 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
3752 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
3753 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
3754 desired_glyphs->used[vpos] = arrow_end;
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 overlay_arrow_seen = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3757 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3759 val.bufpos = pos;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3760 val.ovstring_chars_done = ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3761 val_display_text_line = val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3762 return &val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3763 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3764
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3765 /* 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
3766
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3767 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3768 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3769 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3770 {
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3771 Lisp_Object items, tail;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3772 register int vpos = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3773 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3774 int maxendcol = FRAME_WIDTH (f) + WINDOW_LEFT_MARGIN (w);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3775 int hpos = 0;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3776 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3777
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3778 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
3779 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
3780 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3781 #endif
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3782
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3783 #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
3784 if (FRAME_X_P (f))
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3785 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
3786 #endif /* USE_X_TOOLKIT */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3787
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3788 get_display_line (f, vpos, 0);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3789
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3790 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
3791 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
3792 {
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3793 Lisp_Object pos, string;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3794 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
3795 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3796 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
3797
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
3798 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3799
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3800 if (hpos < maxendcol)
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
3801 hpos = display_string (w, vpos,
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3802 XSTRING (string)->data,
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3803 XSTRING (string)->size,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3804 hpos, 0, 0, hpos, maxendcol, -1);
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
3805 /* 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
3806 if (hpos < maxendcol)
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3807 {
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
3808 int hpos1 = hpos + 1;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3809 hpos = display_string (w, vpos, "", 0, hpos, 0, 0,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3810 min (hpos1, maxendcol), maxendcol, 0);
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3811 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3812 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3813
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3814 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3815 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
3816
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
3817 /* 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
3818 if (maxendcol > hpos)
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3819 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, maxendcol, maxendcol, 0);
4423
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3820
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3821 /* 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
3822 vpos++;
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
3823 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
3824 get_display_line (f, vpos++, 0);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3825 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
3826
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827 /* Display the mode line for window w */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3830 display_mode_line (w)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3831 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833 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
3834 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
3835 register int right = WINDOW_RIGHT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3836 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3837
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3838 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
3839 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3840
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3841 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
3842
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3843 /* 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
3844 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
3845 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
3846 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
3847
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3848 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
3849 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
3850
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3851 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
3852
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3853 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3854
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3855 /* 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
3856 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
3857 partial-width windows and avoid inverting the scroll bar columns. */
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3858 #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
3859 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
3860 {
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3861 /* 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
3862 int i;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3863 unsigned int padding;
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3864 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
3865 for (i = left; i < right; ++i)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3866 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3867 padding = ptr[i] & GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3868 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
3869 }
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
3870 }
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
3871 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
3872 #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
3873
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3874 /* 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
3875 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
3876 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
3877 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
3878 (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
3879 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
3880 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
3881 || 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
3882 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3883 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3884
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3885 /* Contribute ELT to the mode line for window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3886 How it translates into text depends on its data type.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3887
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3888 VPOS is the position of the mode line being displayed.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3889
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3890 HPOS is the position (absolute on frame) where this element's text
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3891 should start. The output is truncated automatically at the right
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3892 edge of window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3894 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3895 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3896
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3897 MINENDCOL is the hpos before which the element may not end.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3898 The element is padded at the right with spaces if nec
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3899 to reach this column.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3900
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3901 MAXENDCOL is the hpos past which this element may not extend.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3902 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3903 (This is necessary to make nested padding and truncation work.)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3904
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3905 Returns the hpos of the end of the text generated by ELT.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3906 The next element will receive that value as its HPOS arg,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3907 so as to concatenate the elements. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3908
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3909 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3910 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3911 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3912 register int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3913 int depth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3914 int minendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3915 register int maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3916 register Lisp_Object elt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3917 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3918 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3919 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3920 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3922 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
3924 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3925 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3926 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3927 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3928 /* A string: output it and check for %-constructs within it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3929 register unsigned char c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 register unsigned char *this = XSTRING (elt)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3931
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3932 while (hpos < maxendcol && *this)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3933 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3934 unsigned char *last = this;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3935 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3936 ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3937 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3938 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3939 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
3940 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3941 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
3942 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3943 hpos = display_string (w, vpos, last, -1, hpos, 0, 1,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3944 hpos, min (lim, maxendcol), -1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3945 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3946 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3947 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3948 register int minendcol;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3949 register int spec_width = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3950
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951 /* We can't allow -ve args due to the "%-" construct */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3952 /* Argument specifies minwidth but not maxwidth
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3953 (maxwidth can be specified by
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3954 (<negative-number> . <stuff>) mode-line elements) */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3955
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 while ((c = *this++) >= '0' && c <= '9')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3957 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3958 spec_width = spec_width * 10 + (c - '0');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3959 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3960
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3961 minendcol = hpos + spec_width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3962 if (minendcol > maxendcol)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3963 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3964 spec_width = maxendcol - hpos;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3965 minendcol = maxendcol;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3966 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3967
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3968 if (c == 'M')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3969 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3970 spec_width, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3971 Vglobal_mode_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3972 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
3973 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3974 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
3975 maxendcol - hpos);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3976 if (frame_title_ptr)
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
3977 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
3978 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3979 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
3980 hpos, 0, 1,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3981 minendcol, maxendcol, -1);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
3982 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3983 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3984 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3985 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3986 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3987
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3988 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3989 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3990 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3991 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3992 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3993 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3994 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3995 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3996 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3997 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3998 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3999 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4000 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
4001 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4002 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4003 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4004 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
4005 minendcol, maxendcol);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4006 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4007 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
4008 XSTRING (tem)->size,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4009 hpos, 0, 1, minendcol, maxendcol, -1);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4010 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4011 /* Give up right away for nil or t. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4012 else if (!EQ (tem, elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4013 { elt = tem; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4014 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4015 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4016 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4017
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4018 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4019 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4020 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4021
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4022 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4023 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4024 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4025 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4026 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4027 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4028 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4029 according to whether the symbol's value is non-nil or nil. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4030 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
4031 if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4032 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4033 tem = Fboundp (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4034 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
4035 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4036 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4037 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4038 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4039 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4040 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4041 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4042 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4043 { elt = XCONS (elt)->car; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4044 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4045 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4046 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4047 and if possible find the caddr and use that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4048 elt = XCONS (elt)->cdr;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4049 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4050 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4051 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4052 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4053 elt = XCONS (elt)->car;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4054 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4055 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4056 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4057 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4058 register int lim = XINT (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4059 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4060 if (lim < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4061 /* Negative int means reduce maximum width.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4062 DO NOT change MINENDCOL here!
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4063 (20 -10 . foo) should truncate foo to 10 col
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4064 and then pad to 20. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4065 maxendcol = min (maxendcol, hpos - lim);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4066 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4067 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4068 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4069 current maximum. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4070 lim += hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4071 if (lim > maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4072 lim = maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4073 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4074 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4075 that is beyond the current truncation point. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4076 if (lim > minendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4077 minendcol = lim;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4078 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4079 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4080 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4081 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4082 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4083 register int limit = 50;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4084 /* 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
4085 while (CONSP (elt) && --limit > 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4086 && hpos < maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4087 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4088 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4089 hpos, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4090 XCONS (elt)->car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4091 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4092 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4093 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4094 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4095 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4096
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4097 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4098 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4099 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4100 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
4101 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4102 hpos = display_string (w, vpos, "*invalid*", -1, hpos, 0, 1,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4103 minendcol, maxendcol, 0);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4104 return hpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4105 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4106
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4107 if (minendcol > hpos)
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4108 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4109 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
4110 else
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4111 hpos = display_string (w, vpos, "", 0, hpos,
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4112 0, 1, minendcol, maxendcol, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4113 return hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4114 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4115
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4116 /* 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
4117 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
4118
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4119 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4120 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4121 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4122 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4123 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4124 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4125 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4126
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4127 if (d <= 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4128 *p++ = '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4129 else
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4130 while (d > 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4131 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4132 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4133 d /= 10;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4134 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4135 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
4136 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4137 while (p > buf)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4138 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4139 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4140 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4141 *p-- = d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4142 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4143 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4144
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4145 /* 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
4146 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
4147 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
4148
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4149 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4150 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
4151 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4152 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4153 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4154 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4155 Lisp_Object val;
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4156 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4157
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4158 val = coding_system;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4159
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4160 if (NILP (val)) /* Not yet decided. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4161 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4162 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4163 *buf++ = '-';
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
4164 if (eol_flag)
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
4165 *buf++ = eol_mnemonic_undecided;
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4166 /* 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
4167 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4168 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4169 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4170 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4171
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4172 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
4173
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4174 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
4175 {
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4176 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
4177 if (NILP (eolvalue))
18834
a4b74a7b692a (decode_mode_spec_coding): Fix typo; use `val' instead of `coding-system'.
Richard M. Stallman <rms@gnu.org>
parents: 18829
diff changeset
4178 eolvalue = Fget (val, Qeol_type);
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4179 }
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4180
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4181 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4182 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4183
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4184 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4185 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4186 /* 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
4187 int eoltype;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4188 /* 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
4189
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4190 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
4191 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
4192 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
4193 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
4194 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
4195 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
4196 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4197 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4198 ? 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
4199
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4200 /* 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
4201 *buf++ = eoltype;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4202 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4203 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4204 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4205 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4206
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4207 /* 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
4208 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
4209 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
4210 function will later be truncated to width MAXWIDTH. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4211
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
4212 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
4213
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4214 static char *
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4215 decode_mode_spec (w, c, spec_width, maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4216 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4217 register char c;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4218 register int spec_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4219 register int maxwidth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4220 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4221 Lisp_Object obj;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4222 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4223 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
4224 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4225
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4226 obj = Qnil;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4227 if (maxwidth > FRAME_WIDTH (f))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4228 maxwidth = FRAME_WIDTH (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4229
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4230 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4231 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4232 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4233 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
4234 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4235 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
4236 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4237 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4238
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4239 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4240 /* 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
4241 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
4242 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4243 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
4244 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4245 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4246
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4247 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4248 /* 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
4249 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
4250 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4251 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4252
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4253 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4254 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4255
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4256 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4257 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4258 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4259 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4260
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4261 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
4262 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4263 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
4264 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
4265 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4266 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4267 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
4268 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4269
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4270 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4271 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4272 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4273 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4274
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4275 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
4276 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4277 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
4278 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
4279 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4280 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4281 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
4282 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4283
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4284 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4285 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4286 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
4287 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
4288
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4289 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
4290 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
4291 else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4292 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4293 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
4294 *p++ = '-';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4295 *p = '\0';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4296 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4297 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
4298 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4299
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4300 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4301 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4302 #if 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4303 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4304 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4305 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4306 decode_mode_spec_buf[maxwidth - 1] = '\\';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4307 decode_mode_spec_buf[maxwidth] = '\0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4308 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4309 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4310 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4311 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4312
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4313 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4314 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4315 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
4316 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
4317 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
4318 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
4319 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4320
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4321 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4322 /* %F displays the frame name. */
20039
83d32ee54f68 (decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents: 19915
diff changeset
4323 /* Systems that can only display a single frame at a time should
83d32ee54f68 (decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents: 19915
diff changeset
4324 NOT replace the frame name with the (constant) frame title,
83d32ee54f68 (decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents: 19915
diff changeset
4325 since then they won't be able to tell which frame is that. */
83d32ee54f68 (decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents: 19915
diff changeset
4326 if (FRAME_WINDOW_P (f) && !NILP (f->title))
15038
2376256a0204 (decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 15037
diff changeset
4327 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
4328 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
4329 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
4330 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
4331
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4332 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4333 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4334 #if 0
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4335 if (NILP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4336 return "[none]";
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4337 else if (STRINGP (obj) && XSTRING (obj)->size > maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4338 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4339 bcopy ("...", decode_mode_spec_buf, 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4340 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4341 decode_mode_spec_buf + 3, maxwidth - 3);
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 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4345 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4346
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4347 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4348 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4349 int startpos = marker_position (w->start);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4350 int line, linepos, topline;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4351 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4352 Lisp_Object tem;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4353 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4354
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4355 /* 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
4356 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4357 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
4358 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
4359 /* 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
4360 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
4361 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4362
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4363 /* 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
4364 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
4365 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4366 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4367 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4368 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4369 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4370
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4371 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4372 && !NILP (w->base_line_pos)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4373 && 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
4374 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4375 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4376 linepos = XFASTINT (w->base_line_pos);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4377 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4378 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4379 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4380 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4381 linepos = BUF_BEGV (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4382 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4383
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4384 /* 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
4385 nlines = display_count_lines (linepos, startpos, startpos, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4386
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4387 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4388
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4389 /* 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
4390 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
4391 "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
4392 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
4393 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4394 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4395 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
4396 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
4397 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4398 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
4399 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4400 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4401 int limit = BUF_BEGV (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4402 int position;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4403 int distance = (height * 2 + 30) * 200;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4404
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4405 if (startpos - distance > limit)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4406 limit = startpos - distance;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4407
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4408 nlines = display_count_lines (startpos, limit,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4409 -(height * 2 + 30),
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4410 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4411 /* 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
4412 200 chars per line,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4413 give up on line numbers for this window. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4414 if (position == startpos - distance)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4415 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4416 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4417 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4418 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4419 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4420
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4421 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
4422 XSETFASTINT (w->base_line_pos, position);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4423 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4424
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4425 /* 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
4426 nlines = display_count_lines (startpos, PT, PT, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4427
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4428 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4429 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4430
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4431 /* Make the string to show. */
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4432 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
4433 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4434 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4435 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4436 char* p = decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4437 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
4438 strcpy (p, "??");
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4439 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4440 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4441 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4442 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4443
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4444 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4445 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4446 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4447
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4448 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4449 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
4450 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4451 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4452
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4453 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4454 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4455 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
4456 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
4457
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4458 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4459 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4460 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4461 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4462 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4463 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4464 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4465 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4466 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4467 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4468 {
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
4469 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
4470 /* 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
4471 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
4472 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
4473 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4474 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4475 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4476 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4477 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4478 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4479 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4480 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4481 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4482
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4483 /* 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
4484 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4485 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4486 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
4487 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
4488 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
4489
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4490 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4491 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4492 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4493 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4494 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4495 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4496 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4497 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4498 {
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
4499 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
4500 /* 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
4501 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
4502 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
4503 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
4504 /* 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
4505 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
4506 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4507 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4508 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4509 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4510 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4511 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4512 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4513 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4514 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4515
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4516 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4517 /* 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
4518 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
4519 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
4520 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
4521 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4522 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
4523 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4524 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4525
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4526 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
4527 #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
4528 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
4529 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4530 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4531 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4532
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4533 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4534 /* 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
4535 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4536 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4537 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4538 int eol_flag = (c == 'Z');
18761
756cb4d82a49 (decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents: 18752
diff changeset
4539 char *p = decode_mode_spec_buf;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4540
19562
318a3a6a8ff5 (decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents: 19478
diff changeset
4541 if (! FRAME_WINDOW_P (f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4542 {
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4543 /* No need to mention EOL here--the terminal never needs
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4544 to do EOL conversion. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4545 p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0);
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4546 p = decode_mode_spec_coding (terminal_coding.symbol, p, 0);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4547 }
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
4548 p = decode_mode_spec_coding (b->buffer_file_coding_system,
18761
756cb4d82a49 (decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents: 18752
diff changeset
4549 p, eol_flag);
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
4550
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4551 #if 0 /* This proves to be annoying; I think we can do without. -- rms. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4552 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4553 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4554 if (PROCESSP (obj))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4555 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4556 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
4557 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4558 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
4559 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4560 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4561 #endif /* subprocesses */
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4562 #endif /* 0 */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4563 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4564 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4565 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4566 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4567
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4568 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4569 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4570 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4571 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4572 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4573
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4574 /* 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
4575 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
4576 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
4577
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4578 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
4579 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
4580 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
4581
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4582 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
4583 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
4584 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
4585 buffer we bumped up against. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4586
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4587 static int
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4588 display_scan_buffer (start, count, shortage)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4589 int *shortage, start;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4590 register int count;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4591 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4592 int limit = ((count > 0) ? ZV - 1 : BEGV);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4593 int direction = ((count > 0) ? 1 : -1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4594
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4595 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4596 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4597
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4598 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4599 register unsigned char *ceiling_addr;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4600
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4601 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4602 check only for newlines. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4603 if (! (!NILP (current_buffer->selective_display)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4604 && !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
4605 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
4606
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4607 /* The code that follows is like scan_buffer
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4608 but checks for either newline or carriage return. */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4609
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4610 if (shortage != 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4611 *shortage = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4612
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4613 if (count > 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4614 while (start != limit + 1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4615 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4616 ceiling = BUFFER_CEILING_OF (start);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4617 ceiling = min (limit, ceiling);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4618 ceiling_addr = POS_ADDR (ceiling) + 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4619 base = (cursor = POS_ADDR (start));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4620 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4621 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4622 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4623 ;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4624 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4625 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4626 if (--count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4627 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4628 immediate_quit = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4629 return (start + cursor - base + 1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4630 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4631 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4632 if (++cursor == ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4633 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4634 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4635 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4636 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4637 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4638 start += cursor - base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4639 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4640 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4641 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4642 start--; /* first character we scan */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4643 while (start > limit - 1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4644 { /* we WILL scan under start */
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4645 ceiling = BUFFER_FLOOR_OF (start);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4646 ceiling = max (limit, ceiling);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4647 ceiling_addr = POS_ADDR (ceiling) - 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4648 base = (cursor = POS_ADDR (start));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4649 cursor++;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4650 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4651 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4652 while (--cursor != ceiling_addr
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4653 && *cursor != '\n' && *cursor != 015)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4654 ;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4655 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4656 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4657 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4658 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4659 immediate_quit = 0;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4660 return (start + cursor - base + 1);
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4661 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4662 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4663 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4664 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4665 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4666 start += cursor - base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4667 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4668 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4669
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4670 if (shortage != 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4671 *shortage = count * direction;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4672 return (start + ((direction == 1 ? 0 : 1)));
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4673 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4674
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4675 /* Count up to N lines starting from FROM.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4676 But don't go beyond LIMIT.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4677 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
4678 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
4679
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4680 static int
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4681 display_count_lines (from, limit, n, pos_ptr)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4682 int from, limit, n;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4683 int *pos_ptr;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4684 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4685 int oldbegv = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4686 int oldzv = ZV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4687 int shortage = 0;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4688
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4689 if (limit < from)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4690 BEGV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4691 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4692 ZV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4693
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4694 *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
4695
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4696 ZV = oldzv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4697 BEGV = oldbegv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4698
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4699 if (n < 0)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4700 /* 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
4701 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
4702 return - n - shortage - (*pos_ptr != limit);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4703 return n - shortage;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4704 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4705
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4706 /* Display STRING on one line of window W, starting at HPOS.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4707 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
4708 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
4709 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
4710
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4711 TRUNCATE is GLYPH to display at end if truncated. Zero for none.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4712
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4713 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
4714 MAXCOL is the last column ok to end at. Truncate here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4715 -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
4716 Both count from the left edge of the frame, as does HPOS.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4717 The right edge of W is an implicit maximum.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4718 If TRUNCATE is nonzero, the implicit maximum is one column before the edge.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4719
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4720 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
4721 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
4722 and not display anything beyond there. Otherwise, only MAXCOL
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4723 controls where to stop output.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4724
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4725 MULTIBYTE can be 0 meaning do not display multibyte chars,
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4726 1 meaning do display them, or -1 meaning obey the current buffer's
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4727 value of enable_multibyte_characters.
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4728
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4729 Returns ending hpos. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4730
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4731 static int
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4732 display_string (w, vpos, string, length, hpos, truncate,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4733 obey_window_width, mincol, maxcol, multibyte)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4734 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4735 unsigned char *string;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4736 int length;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4737 int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4738 GLYPH truncate;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4739 int obey_window_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4740 int mincol, maxcol;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4741 int multibyte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4742 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4743 register int c;
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4744 int truncated;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4745 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4746 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
4747 int tab_width = XINT (XBUFFER (w->buffer)->tab_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4748 register GLYPH *start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4749 register GLYPH *end;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4750 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
4751 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4752 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4753 int window_width = XFASTINT (w->width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4754
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4755 /* Use the standard display table, not the window's display table.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4756 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
4757 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
4758 int i;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4759
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4760 if (multibyte == -1)
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4761 multibyte = !NILP (current_buffer->enable_multibyte_characters);
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4762 /* Now multibyte is 1 if we should display multibyte characters. */
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4763
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
4764 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
4765 dp = XCHAR_TABLE (Vstandard_display_table);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4766
2324
24cd3df6f184 (display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents: 2303
diff changeset
4767 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4768
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4769 p1 = p1start;
18852
ab7fae992236 (display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents: 18834
diff changeset
4770 start = desired_glyphs->glyphs[vpos];
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4771
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4772 if (obey_window_width)
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4773 {
18852
ab7fae992236 (display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents: 18834
diff changeset
4774 start += XFASTINT (w->left);
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4775 end = start + window_width - (truncate != 0);
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4776
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4777 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
4778 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4779 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
4780 {
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4781 int i;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4782
8943
a9e40d478857 (display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents: 8919
diff changeset
4783 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
4784 *end-- = ' ';
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4785 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4786 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f))
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4787 *end-- = '|';
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4788 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4789 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4790
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4791 if (! obey_window_width
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4792 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4793 end = desired_glyphs->glyphs[vpos] + maxcol;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4794
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
4795 /* 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
4796 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
4797 desired_glyphs->charstarts[vpos][i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
4798
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4799 if (maxcol >= 0 && mincol > maxcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4800 mincol = maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4801
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4802 if (length < 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4803 /* We need this value for multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4804 length = strlen (string);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4805
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4806 /* 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
4807 (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
4808 truncated = 0;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4809 while (1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4810 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4811 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4812
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4813 if (length <= 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4814 break;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4815 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4816 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
4817 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4818 c = *string, len = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4819
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4820 string += len, length -= len;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4821
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4822 if (p1 >= end)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4823 {
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4824 truncated = 1;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4825 break;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4826 }
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4827
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4828 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
4829 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4830 p1 = copy_part_of_rope (f, p1, start,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4831 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4832 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4833 0);
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4834 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
4835 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4836 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4837 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4838 *p1 = c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4839 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4840 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4841 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4842 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4843 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4844 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4845 if (p1 >= start && p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4846 *p1 = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4847 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4848 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4849 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4850 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4851 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4852 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4853 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
4854 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4855 (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
4856 && 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
4857 ? 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
4858 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4859 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4860 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4861 *p1 = c ^ 0100;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4862 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4863 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4864 else if (len == 1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4865 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4866 /* C is a control character or a binary byte data. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4867 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
4868 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
4869 (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
4870 && 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
4871 ? 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
4872 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4873 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4874 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4875 *p1 = (c >> 6) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4876 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4877 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4878 *p1 = (7 & (c >> 3)) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4879 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
4880 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4881 *p1 = (7 & c) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4882 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4883 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4884 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4885 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4886 /* C is a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4887 int charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4888 int columns = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4889 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4890 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4891
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4892 if (p1 < start)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4893 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4894 /* 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
4895 columns with spaces. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4896 columns -= start - p1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4897 p1 = start;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4898 while (columns--)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4899 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4900 if (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4901 *p1 = SPACEGLYPH;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4902 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4903 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4904 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4905 else if (p1 + columns > end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4906 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4907 /* 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
4908 columns with TRUNCATE if TRUNCATE is specified. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4909 if (truncate)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4910 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4911 while (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4912 *p1++ = fix_glyph (f, truncate, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4913 /* And tell the line is truncated. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4914 truncated = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4915 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4916 break;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4917 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4918 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4919 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4920 /* 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
4921 *p1++ = c;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4922 while (--columns)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4923 *p1++ = c | GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4924 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4925 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4926 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4927
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
4928 if (truncated)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4929 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4930 p1 = end;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4931 if (truncate) *p1++ = fix_glyph (f, truncate, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4932 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4933 else if (mincol >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4934 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4935 end = desired_glyphs->glyphs[vpos] + mincol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4936 while (p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4937 *p1++ = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4938 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4939
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4940 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4941 register int len = p1 - desired_glyphs->glyphs[vpos];
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4942
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4943 if (len > desired_glyphs->used[vpos])
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4944 desired_glyphs->used[vpos] = len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4945 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4946
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4947 return len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4948 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4949 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4950
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4951 /* 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
4952 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
4953 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
4954 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
4955 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
4956 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4957 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4958
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4959 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4960 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4961 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4962 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4963 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4964 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4965 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
4966 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4967 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4968 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4969 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4970 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4971 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
4972 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4973 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4974 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4975 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4976 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4977 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4978 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4979 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4980 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
4981 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4982 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4983 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4984 if (EQ (propelt, tem))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4985 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4986 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
4987 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4988 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
4989 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4990 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4991 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4992
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4993 /* 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
4994 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
4995 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
4996 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
4997 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
4998 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
4999 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5000
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5001 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5002 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5003 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5004 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5005 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5006 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5007 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
5008 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5009 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5010 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5011 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
5012 return ! NILP (XCONS (tem)->cdr);
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5013 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5014 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5015 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5016 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5017 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5018 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5019 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5020 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
5021 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5022 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5023 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5024 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
5025 return ! NILP (XCONS (tem)->cdr);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5026 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5027 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5028 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5029 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5030
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5031 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5032 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5033 {
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
5034 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
5035 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
5036
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
5037 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
5038 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
5039
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
5040 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
5041 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
5042
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5043 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5044 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
5045
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
5046 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
5047 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
5048
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5049 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5050 staticpro (&last_arrow_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5051 last_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5052 last_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5053
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5054 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
5055 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5056 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5057
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5058 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5059 "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
5060 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5061 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5062 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5063
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5064 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5065 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5066 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5067
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5068 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5069 "*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
5070 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
5071 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
5072
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5073 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5074 "*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
5075 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5076
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5077 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5078 "*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
5079 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
5080 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5081 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5082
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5083 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5084
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5085 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5086 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5087 "*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
5088 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5089
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5090 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5091 "*Non-nil means use inverse video for the mode line.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5092 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
5093
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
5094 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
5095 "*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
5096 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
5097
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
5098 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
5099 "*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
5100 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
5101
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5102 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
5103 "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
5104 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
5105 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
5106 `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
5107
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5108 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
5109 "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
5110 \(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
5111 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
5112 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
5113 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5114 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
5115 "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
5116 \(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
5117 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
5118 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
5119 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5120 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5121 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5122 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5123 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5124 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5125 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5126 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5127 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5128 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5129 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5130
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5131 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5132 "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
5133 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
5134 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5135 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
5136
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
5137 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
5138 "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
5139 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
5140 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
5141 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
5142 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
5143 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
5144
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5145 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
5146 "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
5147 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
5148 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
5149 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
5150 Vwindow_scroll_functions = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5151 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5152
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5153 /* initialize the window system */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5154 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5155 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5156 Lisp_Object root_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5157 #ifndef COMPILER_REGISTER_BUG
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5158 register
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5159 #endif /* COMPILER_REGISTER_BUG */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5160 struct window *mini_w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5161
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5162 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5163
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5164 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
5165 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5166
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5167 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5168 previous_echo_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5169
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5170 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5171 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5172 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
5173 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
5174 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
5175 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
5176 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5177 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5178 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5179
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5180 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
5181 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5182 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5183 }