annotate src/xdisp.c @ 21534:7784f9b030a8

(try_window): Fix mixing of Lisp_Object and int.
author Andreas Schwab <schwab@suse.de>
date Tue, 14 Apr 1998 13:12:18 +0000
parents fa9ff387d260
children c423e8929f69
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.
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 1998
18730
492cb3baf591 (display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents: 18718
diff changeset
3 Free Software Foundation, Inc.
277
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"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
43 #include "region-cache.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
44
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
45 #ifdef HAVE_WINDOW_SYSTEM
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
46 #include "xterm.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
47 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
49 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
50 extern void set_frame_menubar ();
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
51 extern int pending_menu_activation;
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
52 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
53
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
57 extern int minibuffer_auto_raise;
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
58
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
59 extern Lisp_Object Qface;
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
60
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
61 extern Lisp_Object Voverriding_local_map;
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
62 extern Lisp_Object Voverriding_local_map_menu_flag;
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
63
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
64 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
65 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
66 Lisp_Object Qredisplay_end_trigger_functions;
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
67
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
68 /* Nonzero means print newline to stdout before next minibuffer message. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
69
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
72 /* 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
73
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
74 static int message_log_need_newline;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
75
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76 #define min(a, b) ((a) < (b) ? (a) : (b))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
77 #define max(a, b) ((a) > (b) ? (a) : (b))
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
78 #define minmax(floor, val, ceil) \
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
79 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 /* The buffer position of the first character appearing
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
82 entirely or partially on the current frame line.
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
83 Or zero, which disables the optimization for the current frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
84 static int this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86 /* Number of characters past the end of this line,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87 including the terminating newline */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 static int this_line_endpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
90 /* The vertical position of this frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 static int this_line_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
93 /* Hpos value for start of display on this frame line.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 Usually zero, but negative if first character really began
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95 on previous line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 static int this_line_start_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 /* Buffer that this_line variables are describing. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 /* 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
102 If this is nonzero, there is a message on the frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 in the minibuffer and it should be erased as soon
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 as it is no longer requested to appear. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 char *previous_echo_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
107 /* Nonzero means truncate lines in all windows less wide than the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
110 /* 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
111 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
112 int multiple_frames;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
113
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116 /* Marker for where to display an arrow on top of the buffer text. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 /* String to display for the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
122 /* Values of those variables at last redisplay.
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
123 However, if Voverlay_arrow_position is a marker,
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
124 last_arrow_position is its numerical position. */
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
125 static Lisp_Object last_arrow_position, last_arrow_string;
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
126
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
127 /* 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
128 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
129
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
130 /* 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
131 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
132
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
133 /* 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
134 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
135 have changed. */
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
136 static Lisp_Object Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
137
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
138 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
139
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 /* Nonzero if overlay arrow has been displayed once in this window. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
142
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
143 /* 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
144 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
145 strings that get displayed there.) */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
146 static int zv_strings_seen;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
147
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
148 /* 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
149 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
150
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
151 /* If cursor motion alone moves point off frame,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 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
153 static int scroll_step;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
155 /* 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
156 when appropriate. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
157 static int scroll_conservatively;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
158
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
159 /* 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
160 of the top or bottom of the window. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
161 int scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
162
20259
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
163 /* Number of characters of overlap to show,
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
164 when scrolling a one-line window such as a minibuffer. */
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
165 static int minibuffer_scroll_overlap;
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
166
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 /* Nonzero if try_window_id has made blank lines at window bottom
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 since the last redisplay that paused */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 static int blank_end_of_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
171 /* 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
172 (or another buffer with the same base buffer).
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 keyboard.c refers to this. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
176 /* 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
177 whether the window is selected or not.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 Set one to -1 first to determine whether point was found afterwards. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 static int cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 static int cursor_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
183 static int debug_end_pos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 /* Nonzero means display mode line highlighted */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
188 static void redisplay_internal ();
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
189 static int message_log_check_duplicate ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 static void echo_area_display ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 void mark_window_display_accurate ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 static void redisplay_windows ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 static void redisplay_window ();
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
194 static void update_menu_bar ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 static void try_window ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 static int try_window_id ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 static struct position *display_text_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 static void display_mode_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 static int display_mode_element ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 static char *decode_mode_spec ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 static int display_string ();
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
202 static void display_menu_bar ();
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
203 static int display_count_lines ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 /* 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
206 Lisp_Object minibuf_prompt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 /* Width in columns of current minibuffer prompt. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 int minibuf_prompt_width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 /* Message to display instead of minibuffer contents
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 This is what the functions error and message make,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 and command echoing uses it as well.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 It overrides the minibuf_prompt as well as the buffer. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 char *echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
217 /* 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
218 int echo_area_glyphs_length;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
219
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
220 /* 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
221 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
222 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
223 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
224
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
225 /* 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
226 message was specified. */
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
227 int message_enable_multibyte;
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
228
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 /* true iff we should redraw the mode lines on the next redisplay */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 /* Smallest number of characters before the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 int beg_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 /* Smallest number of characters after the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 int end_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 /* 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
243 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
244 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 contain no useful information */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 int unchanged_modified;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
248 /* 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
249 int overlay_unchanged_modified;
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
250
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 /* Nonzero if window sizes or contents have changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 since last redisplay that finished */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
255 /* 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
256 and it displayed a line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
257 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
258
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
259 /* 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
260 static int line_number_display_limit;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
261
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
262 /* 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
263 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
264 Lisp_Object Vmessage_log_max;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
265
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
266 #define COERCE_MARKER(X) \
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
267 (MARKERP ((X)) ? Fmarker_position (X) : (X))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
268
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
269 static int pos_tab_offset P_ ((struct window *, int, int));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
271 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
272
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
273 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
274 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
275 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
276 if (message_log_need_newline)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
277 message_dolog ("", 0, 1, 0);
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
278 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
279
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
280
10442
d379e2c60766 (message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents: 10441
diff changeset
281 /* 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
282 This function calls low-level routines in order to bypass text property
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
283 hooks, etc. which might not be safe to run.
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
284 MULTIBYTE, if nonzero, means interpret the contents of M as multibyte. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
285
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
286 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
287 message_dolog (m, len, nlflag, multibyte)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
288 char *m;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
289 int len, nlflag, multibyte;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
290 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
291 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
292 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
293 struct buffer *oldbuf;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
294 Lisp_Object oldpoint, oldbegv, oldzv;
13733
e51b69e60614 (message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 13655
diff changeset
295 int old_windows_or_buffers_changed = windows_or_buffers_changed;
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
296 int point_at_end = 0;
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
297 int zv_at_end = 0;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
298 Lisp_Object old_deactivate_mark;
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
299
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
300 old_deactivate_mark = Vdeactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
301 oldbuf = current_buffer;
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
302 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
303 current_buffer->undo_list = Qt;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
304
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
305 oldpoint = Fpoint_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
306 oldbegv = Fpoint_min_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
307 oldzv = Fpoint_max_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
308
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
309 if (PT == Z)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
310 point_at_end = 1;
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
311 if (ZV == Z)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
312 zv_at_end = 1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
313
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
314 BEGV = BEG;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
315 BEGV_BYTE = BEG_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
316 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
317 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
318 TEMP_SET_PT_BOTH (Z, Z_BYTE);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
319
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
320 /* Insert the string--maybe converting multibyte to single byte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
321 or vice versa, so that all the text fits the buffer. */
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
322 if (multibyte
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
323 && NILP (current_buffer->enable_multibyte_characters))
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
324 {
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
325 int c, i = 0, nbytes;
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
326 /* Convert a multibyte string to single-byte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
327 for the *Message* buffer. */
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
328 while (i < len)
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
329 {
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
330 c = STRING_CHAR (m + i, len - i);
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
331 i += XFASTINT (Fchar_bytes (make_number (c)));
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
332 /* Truncate the character to its last byte--we can only hope
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
333 the user is happy with the character he gets,
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
334 since if it isn't right, there is no way to do it right. */
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
335 c &= 0xff;
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
336 insert_char (c);
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
337 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
338 }
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
339 else if (! multibyte
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
340 && ! NILP (current_buffer->enable_multibyte_characters))
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
341 {
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
342 int i = 0;
20786
49d68bf8f34b (message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents: 20703
diff changeset
343 unsigned char *msg = (unsigned char *) m;
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
344 /* Convert a single-byte string to multibyte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
345 for the *Message* buffer. */
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
346 while (i < len)
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
347 {
20786
49d68bf8f34b (message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents: 20703
diff changeset
348 int c = unibyte_char_to_multibyte (msg[i++]);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
349 insert_char (c);
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
350 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
351 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
352 else if (len)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
353 insert_1 (m, len, 1, 0, 0);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
354
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
355 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
356 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
357 int this_bol, this_bol_byte, prev_bol, prev_bol_byte, dup;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
358 insert_1 ("\n", 1, 1, 0, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
359
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
360 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
361 this_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
362 this_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
363
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
364 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
365 {
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
366 scan_newline (PT, PT_BYTE, BEG, BEG_BYTE, -2, 0);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
367 prev_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
368 prev_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
369
20964
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
370 dup = message_log_check_duplicate (prev_bol, prev_bol_byte,
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
371 this_bol, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
372 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
373 {
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
374 del_range_both (prev_bol, prev_bol_byte,
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
375 this_bol, this_bol_byte, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
376 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
377 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
378 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
379 int duplen;
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 /* 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
382 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
383 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
384 duplen = strlen (dupstr);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
385 TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
386 insert_1 (dupstr, duplen, 1, 0, 1);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
387 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
388 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
389 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
390
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
391 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
392 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
393 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
394 -XFASTINT (Vmessage_log_max) - 1, 0);
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
395 del_range_both (BEG, BEG_BYTE, PT, PT_BYTE, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
396 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
397 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
398 BEGV = XMARKER (oldbegv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
399 BEGV_BYTE = marker_byte_position (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
400
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
401 if (zv_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
402 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
403 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
404 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
405 }
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
406 else
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
407 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
408 ZV = XMARKER (oldzv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
409 ZV_BYTE = marker_byte_position (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
410 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
411
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
412 if (point_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
413 TEMP_SET_PT_BOTH (Z, Z_BYTE);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
414 else
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
415 Fgoto_char (oldpoint);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
416
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
417 free_marker (oldpoint);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
418 free_marker (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
419 free_marker (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
420
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
421 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
422 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
423 message_log_need_newline = !nlflag;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
424 Vdeactivate_mark = old_deactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
425 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
426 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
427
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
428 /* 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
429 (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
430 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
431 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
432 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
433
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
434 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
435 message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte)
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
436 int prev_bol, this_bol;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
437 int prev_bol_byte, this_bol_byte;
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
438 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
439 int i;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
440 int len = Z - 1 - this_bol;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
441 int seen_dots = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
442 unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
443 unsigned char *p2 = BUF_BYTE_ADDRESS (current_buffer, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
444
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
445 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
446 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
447 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
448 && p1[i] != '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
449 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
450 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
451 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
452 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
453 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
454 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
455 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
456 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
457 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
458 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
459 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
460 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
461 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
462 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
463 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
464 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
465 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
466
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
467 /* 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
468 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
469 existing message, and let the minibuffer text show through.
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
470
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
471 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
472 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
473
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
474 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
475 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
476
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
477 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
478 message2 (m, len, multibyte)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
479 char *m;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
480 int len;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
481 int multibyte;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
482 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
483 /* 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
484 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
485 if (m)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
486 message_dolog (m, len, 1, multibyte);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
487 message2_nolog (m, len, multibyte);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
488 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
489
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
490
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
491 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
492
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
493 void
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
494 message2_nolog (m, len, multibyte)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
495 char *m;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
496 int len;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
497 {
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
498 message_enable_multibyte = multibyte;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
499
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
500 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
501 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
502 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
503 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
504 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
505 if (m)
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
506 fwrite (m, len, 1, stderr);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
507 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
508 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
509 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
510 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
511 /* 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
512 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
513 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
514 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
515 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
516 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
517 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
518
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
519 /* 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
520 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
521 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
522 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
523
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
524 FRAME_SAMPLE_VISIBILITY (f);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
525 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
526 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
527 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
528
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
529 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
530 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
531 echo_area_glyphs = m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
532 echo_area_glyphs_length = len;
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
533
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
534 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
535 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
536 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
537 else
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
538 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
539
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
540 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
541 echo_area_display ();
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
542 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
543 do_pending_window_change ();
6661
a26e7181f36b (display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents: 6650
diff changeset
544 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
545 (*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
546 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
547 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
548
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
549 /* Display in echo area the null-terminated ASCII-only string M.
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
550 If M is 0, clear out any existing message,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
551 and let the minibuffer text show through.
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
552
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
553 The string M must continue to exist until after the echo area
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
554 gets cleared or some other message gets displayed there.
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
555
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
556 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
557 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
558
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
559 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
560 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
561 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
562 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
563 message2 (m, (m ? strlen (m) : 0), 0);
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
564 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
565
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
566 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
567 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
568 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
569 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
570 message2_nolog (m, (m ? strlen (m) : 0), 0);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
571 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
572
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
573 /* Display a message M which contains a single %s
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
574 which gets replaced with STRING. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
575
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
576 void
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
577 message_with_string (m, string, log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
578 char *m;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
579 Lisp_Object string;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
580 int log;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
581 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
582 if (noninteractive)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
583 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
584 if (m)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
585 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
586 if (noninteractive_need_newline)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
587 putc ('\n', stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
588 noninteractive_need_newline = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
589 fprintf (stderr, m, XSTRING (string)->data);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
590 if (cursor_in_echo_area == 0)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
591 fprintf (stderr, "\n");
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
592 fflush (stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
593 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
594 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
595 else if (INTERACTIVE)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
596 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
597 /* The frame whose minibuffer we're going to display the message on.
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
598 It may be larger than the selected frame, so we need
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
599 to use its buffer, not the selected frame's buffer. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
600 Lisp_Object mini_window;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
601 FRAME_PTR f;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
602
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
603 /* Get the frame containing the minibuffer
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
604 that the selected frame is using. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
605 mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
606 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
607
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
608 /* A null message buffer means that the frame hasn't really been
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
609 initialized yet. Error messages get reported properly by
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
610 cmd_error, so this must be just an informative message; toss it. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
611 if (FRAME_MESSAGE_BUF (f))
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
612 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
613 int len;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
614 char *a[1];
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
615 a[0] = (char *) XSTRING (string)->data;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
616
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
617 len = doprnt (FRAME_MESSAGE_BUF (f),
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
618 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
619
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
620 if (log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
621 message2 (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
622 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
623 else
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
624 message2_nolog (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
625 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
626
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
627 /* Print should start at the beginning of the message
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
628 buffer next time. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
629 message_buf_print = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
630 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
631 }
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
632 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
633
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
634 /* 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
635 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
636
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
637 void
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
638 truncate_echo_area (len)
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
639 int len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
640 {
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
641 /* 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
642 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
643 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
644 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
645 echo_area_glyphs_length = len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
646 }
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
647
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
648 /* 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
649 zero if being used by message. */
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
650 int message_buf_print;
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
651
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
652 /* 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
653 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
654
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
655 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
656 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
657 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
658 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
659 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
661 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
662 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
663 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
664 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
665 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
666 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
667 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
668 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
669 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
670 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
671 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
672 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
673 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
674 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
675 {
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
676 /* 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
677 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
678 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
679 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
680 FRAME_PTR f;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
681
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
682 /* 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
683 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
684 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
685 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
686
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
687 /* 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
688 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
689 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
690 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
691 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
692 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
693 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
694 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
695 #ifdef NO_ARG_ARRAY
20376
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
696 char *a[3];
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
697 a[0] = (char *) a1;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
698 a[1] = (char *) a2;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
699 a[2] = (char *) a3;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
700
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
701 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
702 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
703 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
704 len = doprnt (FRAME_MESSAGE_BUF (f),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
705 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
706 (char **) &a1);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
707 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
708
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
709 message2 (FRAME_MESSAGE_BUF (f), len, 0);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
710 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
711 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
712 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
713
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
714 /* 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
715 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
716 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
717 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
718 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
720
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
721 /* The non-logging version of message. */
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
722 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
723 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
724 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
725 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
726 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
727 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
728 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
729 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
730 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
731 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
732 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
733
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
734 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
735 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
736 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
737 message2 (echo_area_glyphs, echo_area_glyphs_length,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
738 ! NILP (current_buffer->enable_multibyte_characters));
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
739 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
740
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
742 echo_area_display ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
743 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744 register int vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
745 FRAME_PTR f;
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
746 Lisp_Object mini_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
747
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
748 /* 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
749 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
750 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
751 /* 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
752 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
753
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
754 if (! FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
756
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
757 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
759 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
760 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
763 if (echo_area_glyphs || minibuf_level == 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
764 {
16266
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
765 int i;
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
766
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
767 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
768
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
769 vpos = XFASTINT (XWINDOW (mini_window)->top);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
770 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
771
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
772 /* 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
773 are always clear. */
67f0dc60a944 (echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents: 16255
diff changeset
774 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
775 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
776
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
777 display_string (XWINDOW (mini_window), vpos,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
778 echo_area_glyphs ? echo_area_glyphs : "",
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
779 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
780 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
781 0, 0, 0,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
782 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
783 message_enable_multibyte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
784
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
785 #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
786 /* 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
787 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
788 FRAME_CURSOR_Y (f) = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
789 if (FRAME_CURSOR_Y (f) == vpos)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
790 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
791 #endif
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
792
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
793 /* Fill the rest of the minibuffer window with blank lines. */
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
794 {
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
795 int i;
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
796
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
797 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
798 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
799 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
800 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
801 /* 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
802 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
803 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
804 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
805 "", 0,
18718
1fb4c75d4f1f (echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents: 18703
diff changeset
806 0, 0, 0,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
807 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
808 0);
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
809 }
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
810 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
811 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
812 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
813 windows_or_buffers_changed++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
814
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
815 if (EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
816 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
817
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
818 previous_echo_glyphs = echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
819 }
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
820
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
821 /* 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
822
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
823 #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
824 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
825 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
826
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
827 static int
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
828 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
829 char *str;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
830 int mincol, maxcol;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
831 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
832 char *limit;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
833 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
834 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
835 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
836 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
837 *frame_title_ptr++ = *str++;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
838 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
839 *frame_title_ptr++ = ' ';
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
840 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
841 }
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
842
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
843 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
844 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
845 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
846 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
847 Lisp_Object fmt;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
848 struct buffer *obuf;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
849 int len;
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
850 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
851
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
852 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
853 return;
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
854
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
855 /* 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
856 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
857 Lisp_Object tail;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
858
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
859 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
860 {
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
861 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
862
11948
19ebc17d1288 (x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents: 11920
diff changeset
863 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
864 && !FRAME_MINIBUF_ONLY_P (tf)
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
865 && (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
866 break;
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
867 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
868
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
869 multiple_frames = CONSP (tail);
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
870 }
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
871
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
872 obuf = current_buffer;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
873 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
874 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
875 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
876 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
877 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
878 frame_title_ptr = 0;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
879 set_buffer_internal (obuf);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
880 /* 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
881 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
882 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
883 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
884 level than this.) */
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
885 if (! STRINGP (f->name) || STRING_BYTES (XSTRING (f->name)) != len
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
886 || 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
887 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
888 }
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
889 #else
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
890 #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
891 #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
892 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
893
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
894 /* 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
895 This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
896
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
897 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
898 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
899 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
900 register struct window *w = XWINDOW (selected_window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
901 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
902 struct gcpro gcpro1, gcpro2;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
903
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
904 all_windows = (update_mode_lines || buffer_shared > 1
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
905 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
906
11920
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
907 /* 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
908 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
909 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
910
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
911 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
912 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
913 "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
914 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
915 has yet been specified."
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
916 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
917 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
918 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
919 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
920 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
921
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
922 FOR_EACH_FRAME (tail, frame)
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
923 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
924 || FRAME_ICONIFIED_P (XFRAME (frame)))
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
925 x_consider_frame_title (frame);
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
926 }
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
927 #endif
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
928
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
929 /* Update the menu bar item lists, if appropriate.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
930 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
931 or generation of display lines. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
932 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
933 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
934 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
935 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
936
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
937 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
938
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
939 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
940 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
941 /* 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
942 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
943 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
944 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
945 Lisp_Object functions;
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
946 /* 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
947 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
948 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
949 GCPRO2 (tail, functions);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
950 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
951 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
952 call1 (XCONS (functions)->car, frame);
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
953 functions = XCONS (functions)->cdr;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
954 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
955 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
956 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
957 GCPRO1 (tail);
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
958 update_menu_bar (XFRAME (frame), 0);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
959 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
960 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
961
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
962 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
963 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
964 else
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
965 update_menu_bar (selected_frame, 1);
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
966
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
967 /* 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
968 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
969 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
970 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
971 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
972 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
973
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
974 /* Do a frame update, taking possible shortcuts into account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
975 This is the main external entry point for redisplay.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
976
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
977 If the last redisplay displayed an echo area message and that
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
978 message is no longer requested, we clear the echo area
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
979 or bring back the minibuffer if that is in use.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
981 Do not call eval from within this function.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
982 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
983 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
984 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
985 but can still lose, because this function
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
986 can be called from signal handlers; with alarms set up;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
987 or with synchronous processes running.
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
988
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
989 See Fcall_process; if you called it from here, it could be
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
990 entered recursively. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
991
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
992 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
993
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
994 /* 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
995 no more than once ever 1000 redisplays. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
996 static int clear_face_cache_count;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
997
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
998 /* Record the previous terminal frame we displayed. */
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
999 static FRAME_PTR previous_terminal_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1000
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1001 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1002 redisplay ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1004 redisplay_internal (0);
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1005 }
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1006
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1007 /* 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
1008 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
1009 preserve the echo area. (Actually, our caller does that job.)
21d5ceaa4d23 Commenht change.
Richard M. Stallman <rms@gnu.org>
parents: 14682
diff changeset
1010 Perhaps in the future avoid recentering windows
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1011 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
1012
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1013 static void
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1014 redisplay_internal (preserve_echo_area)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1015 int preserve_echo_area;
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1016 {
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 register struct window *w = XWINDOW (selected_window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1018 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019 int must_finish = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 int all_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021 register int tlbufpos, tlendpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1022 struct position pos;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1023 int number_of_visible_frames;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1024
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1025 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1026 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1027
14559
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
1028 #ifdef USE_X_TOOLKIT
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
1029 if (popup_activated ())
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
1030 return;
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
1031 #endif
de955910bcef (redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents: 14465
diff changeset
1032
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1033 retry:
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1034
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1035 if (! FRAME_WINDOW_P (selected_frame)
12765
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1036 && previous_terminal_frame != selected_frame)
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1037 {
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1038 /* 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
1039 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
1040 windows_or_buffers_changed++;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1041 SET_FRAME_GARBAGED (selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1042 XSETFRAME (Vterminal_frame, selected_frame);
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1043 }
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1044 previous_terminal_frame = selected_frame;
27b568b455b1 (redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents: 12684
diff changeset
1045
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1046 /* 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
1047 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
1048 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
1049 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
1050 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1051 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
1052
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1053 number_of_visible_frames = 0;
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1054
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1055 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
1056 {
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1057 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1058
19197
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1059 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
1060 number_of_visible_frames++;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1061
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1062 /* 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
1063 glyphs to display. */
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1064 init_desired_glyphs (XFRAME (frame));
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1065 }
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1066 }
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1067
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1068 /* Notice any pending interrupt request to change frame size. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1071 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1072 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
1073 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1074 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1075 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1077 prepare_menu_bars ();
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
1078
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1079 if (windows_or_buffers_changed)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1080 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1082 /* 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
1083 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 if (buffer_shared > 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1089
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1090 /* If %c is in use, update it if needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1091 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1092 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1093 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1094 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1095 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1096 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1097 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1098 w->update_mode_line = Qt;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1099
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1100 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 all_windows = update_mode_lines || buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1103
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1104 /* If specs for an arrow have changed, do thorough redisplay
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 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
1106 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
1107 || ! EQ (Voverlay_arrow_string, last_arrow_string))
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1108 all_windows = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1110 /* 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
1111 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
1112 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
1113 again here. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1114 if (echo_area_glyphs || previous_echo_glyphs)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1115 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1116 echo_area_display ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1117 must_finish = 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1118 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1119
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1120 /* 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
1121 if (((!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1122 && !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
1123 != !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
1124 || (!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
1125 && !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
1126 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
1127 this_line_bufpos = -1;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1128
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1129 tlbufpos = this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1130 tlendpos = this_line_endpos;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1131 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
1132 && !current_buffer->clip_changed
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1133 && 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
1134 && !FRAME_OBSCURED_P (XFRAME (w->frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1135 /* Make sure recorded data applies to current buffer, etc */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 && this_line_buffer == current_buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 && current_buffer == XBUFFER (w->buffer)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1138 && NILP (w->force_start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1139 /* 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
1140 && PT >= tlbufpos
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1141 && PT <= Z - tlendpos
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 /* All text outside that line, including its final newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1143 must be unchanged */
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1144 && ((XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1145 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1146 || (beg_unchanged >= tlbufpos - 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 && GPT >= tlbufpos
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1148 /* If selective display, can't optimize
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1149 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
1150 && ((INTEGERP (current_buffer->selective_display)
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1151 && XINT (current_buffer->selective_display) > 0
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1152 ? (beg_unchanged >= tlbufpos
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1153 && GPT > tlbufpos)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1154 : 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155 && end_unchanged >= tlendpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1156 && Z - GPT >= tlendpos)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1158 int tlbufpos_byte = CHAR_TO_BYTE (tlbufpos);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1159 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos_byte - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 && (tlbufpos == ZV
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1161 || FETCH_BYTE (tlbufpos_byte) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 /* Former continuation line has disappeared by becoming empty */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1163 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1164 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
1165 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 || MINI_WINDOW_P (w))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1168 /* 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
1169 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
1170 line 885).
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1171
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1172 For instance, in the following case:
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1173
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1174 -------- Insert --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1175 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
1176 J_I_ ==> J_I_ `^^' are cursors.
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1177 ^^ ^^
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1178 -------- --------
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1179
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1180 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
1181
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1182 struct position val;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1183 int prevline;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1184 int opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1185
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1186 scan_newline (tlbufpos, tlbufpos_byte, BEGV, BEGV_BYTE, -1, 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1187
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1188 val = *compute_motion (PT, 0,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1189 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
1190 0,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1191 tlbufpos,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1192 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1193 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1194 window_internal_width (w) - 1,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1195 XINT (w->hscroll), 0, w);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1196 SET_PT_BOTH (opoint, opoint_byte);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1197 if (val.hpos != this_line_start_hpos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1198 goto cancel;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1199
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1202 zv_strings_seen = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1203 display_text_line (w, tlbufpos, tlbufpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1204 this_line_vpos, this_line_start_hpos,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1205 pos_tab_offset (w, tlbufpos, tlbufpos_byte), 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206 /* If line contains point, is not continued,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 and ends at same distance from eob as before, we win */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1208 if (cursor_vpos >= 0 && this_line_bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1209 && this_line_endpos == tlendpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1210 {
6650
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
1211 /* 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
1212 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
1213 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
1214 < 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
1215 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1216 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
1217 int *charstart_next_line
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1218 = 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
1219 int adjust;
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1220
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1221 if (Z - tlendpos == ZV)
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1222 /* 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
1223 There is no newline to count. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1224 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
1225 else
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1226 /* This line ends in a newline.
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1227 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
1228 text that follows. */
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1229 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
1230
07be9ae289ce (display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents: 6630
diff changeset
1231 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
1232 }
6619
b3631c88ec7e (redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents: 6612
diff changeset
1233
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1234 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1238 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1240 }
12410
1c02a5b45ae7 (echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents: 12348
diff changeset
1241 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
1242 /* 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
1243 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
1244 && 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
1245 && (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
1246 > FRAME_CURSOR_Y (selected_frame)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 if (!must_finish)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1249 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1253 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1254 }
11641
748feea0a51a (redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11531
diff changeset
1255 /* 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
1256 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
1257 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
1258 && !NILP (current_buffer->mark_active))
17698
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1259 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1260 || 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
1261 && 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
1262 && !cursor_in_echo_area)
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 pos = *compute_motion (tlbufpos, 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1265 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1266 0,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1267 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
1268 window_internal_width (w) - 1,
574
58047bf5d46c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 528
diff changeset
1269 XINT (w->hscroll),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1270 pos_tab_offset (w, tlbufpos, tlbufpos_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1271 w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 if (pos.vpos < 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1274 int width = window_internal_width (w) - 1;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1275 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
1276 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1277 FRAME_CURSOR_Y (selected_frame) = this_line_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1278 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1279 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1280 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1281 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1282 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1283 cancel:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1284 /* Text changed drastically or point moved off of line */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1285 cancel_line (this_line_vpos, selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1287
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1288 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1289 all_windows |= buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1290
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1291 clear_face_cache_count++;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1292
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1293 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1295 Lisp_Object tail, frame;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1296
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
1297 #ifdef HAVE_FACES
9530
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1298 /* 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
1299 and not too often either. */
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1300 if (clear_face_cache_count > 1000)
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1301 {
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1302 clear_face_cache ();
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1303 clear_face_cache_count = 0;
a605bfe5bf8a (redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents: 9451
diff changeset
1304 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1305 #endif
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1306
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307 /* Recompute # windows showing selected buffer.
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1308 This will be incremented each time such a window is displayed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 buffer_shared = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1311 FOR_EACH_FRAME (tail, frame)
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1312 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
1313 FRAME_PTR f = XFRAME (frame);
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1314 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
1315 {
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1316
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1317 /* 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
1318 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
1319 if (condemn_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1320 (*condemn_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1321
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1322 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
1323 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
1324
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1325 /* 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
1326 should now go away. */
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1327 if (judge_scroll_bars_hook)
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1328 (*judge_scroll_bars_hook) (f);
813b186e70d8 (redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents: 10764
diff changeset
1329 }
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1330 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1331 }
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1332 else if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1333 {
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1334 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
1335 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1339 update:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1340 /* Prevent various kinds of signals during display update.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1341 stdio is not robust about handling signals,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1342 which can cause an apparent I/O error. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1343 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1344 unrequest_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1345 stop_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1346
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1347 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1348 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1349 Lisp_Object tail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1350
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 pause = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1353 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1355 FRAME_PTR f;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1356
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1357 if (!FRAMEP (XCONS (tail)->car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1358 continue;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1360 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
1361
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1362 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
1363 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1365 pause |= update_frame (f, 0, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1366 if (!pause)
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1367 {
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1368 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
1369 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
1370 (*frame_up_to_date_hook) (f);
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1371 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1372 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1373 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375 else
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1376 {
19701
18d979b08faf (redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents: 19571
diff changeset
1377 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
1378 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
1379 else
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1380 pause = 0;
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
1381
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1382 /* 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
1383 function. If the echo area is on another frame, that may
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1384 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
1385 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
1386 it here. */
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1387 {
12792
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1388 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
1389 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
1390
937154a9dfbe (redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents: 12765
diff changeset
1391 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
1392 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1393
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
1394 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1395 pause |= update_frame (mini_frame, 0, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1396 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1397 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1398
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1399 /* If frame does not match, prevent doing single-line-update next time.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 Also, don't forget to check every line to update the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401 if (pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403 this_line_bufpos = 0;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1404 if (!NILP (last_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1407 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1409 /* If we pause after scrolling, some lines in current_frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1410 may be null, so preserve_other_columns won't be able to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 preserve all the vertical-bar separators. So, avoid using it
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1412 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
1413 if (!WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1414 update_mode_lines = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1415 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1416
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1417 /* Now text on frame agrees with windows, so
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1418 put info into the windows for partial redisplay to follow */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1419
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1420 if (!pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1421 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1422 register struct buffer *b = XBUFFER (w->buffer);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 blank_end_of_window = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1425 unchanged_modified = BUF_MODIFF (b);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1426 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427 beg_unchanged = BUF_GPT (b) - BUF_BEG (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 end_unchanged = BUF_Z (b) - BUF_GPT (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1430 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
1431 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
1432 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1434 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
1435 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1438 b->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1439 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
1440 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
1441 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
1442 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1443 = (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
1444 ? Qt : Qnil);
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1445
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1446 /* 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
1447 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
1448 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
1449 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1450 || 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
1451 && !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
1452 ? 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
1453 : Qnil);
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
1454
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1455 w->window_end_valid = w->buffer;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1456 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457 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
1458 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
1459 verify_charstarts (w);
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
1460 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
1461 (*frame_up_to_date_hook) (selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1462 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 update_mode_lines = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1464 windows_or_buffers_changed = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1465 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1466
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1467 /* Start SIGIO interrupts coming again.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1468 Having them off during the code above
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1469 makes it less likely one will discard output,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470 but not impossible, since there might be stuff
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1471 in the system buffer here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1472 But it is much hairier to try to do anything about that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1473
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1474 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1475 request_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1476 start_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1477
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1478 /* 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
1479 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
1480 if (!pause)
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1481 {
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1482 Lisp_Object tail, frame;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1483 int new_count = 0;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1484
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1485 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
1486 {
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1487 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
1488
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1489 if (XFRAME (frame)->visible)
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1490 this_is_visible = 1;
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1491 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1492 if (XFRAME (frame)->visible)
bca1fd2554e0 (redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents: 19120
diff changeset
1493 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
1494
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1495 if (this_is_visible)
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1496 new_count++;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1497 }
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1498
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
1499 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
1500 windows_or_buffers_changed++;
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1501 }
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
1502
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1503 /* Change frame size now if a change is pending. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1504 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
1505
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1506 /* 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
1507 visible frames, redisplay again. */
7757
8d27747de7ca (redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents: 7752
diff changeset
1508 if (windows_or_buffers_changed && !pause)
18703
2e597c7309b3 (redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18684
diff changeset
1509 goto retry;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1510 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1511
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1512 /* Redisplay, but leave alone any recent echo area message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1513 unless another message has been requested in its place.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1514
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1515 This is useful in situations where you need to redisplay but no
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1516 user action has occurred, making it inappropriate for the message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517 area to be cleared. See tracking_off and
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1518 wait_reading_process_input for examples of these situations. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1519
20363
f3c322901601 (redisplay_preserve_echo_area): Declare it as void.
Kenichi Handa <handa@m17n.org>
parents: 20259
diff changeset
1520 void
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1521 redisplay_preserve_echo_area ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1522 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525 echo_area_glyphs = previous_echo_glyphs;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1526 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 else
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1530 redisplay_internal (1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 mark_window_display_accurate (window, flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 int flag;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1537 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1538 register struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1540 for (;!NILP (window); window = w->next)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541 {
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
1542 if (!WINDOWP (window)) abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1545 if (!NILP (w->buffer))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1546 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1547 XSETFASTINT (w->last_modified,
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1548 !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
1549 XSETFASTINT (w->last_overlay_modified,
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1550 !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
1551 w->last_had_star
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1552 = (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
1553 ? Qt : Qnil);
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1554
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1555 /* 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
1556 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
1557 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
1558 && (w == XWINDOW (current_buffer->last_selected_window)
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
1559 || highlight_nonselected_windows)
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1560 && !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
1561 ? 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
1562 : Qnil);
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1563 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1564
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
1565 w->window_end_valid = w->buffer;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566 w->update_mode_line = Qnil;
14263
082e86e9bca3 (mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents: 14206
diff changeset
1567 if (!NILP (w->buffer) && flag)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1568 XBUFFER (w->buffer)->clip_changed = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1569
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1570 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1571 mark_window_display_accurate (w->vchild, flag);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1572 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1573 mark_window_display_accurate (w->hchild, flag);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1574 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1575
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1576 if (flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1577 {
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
1578 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1579 last_arrow_string = Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1580 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1581 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1582 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1583 /* t is unequal to any useful value of Voverlay_arrow_... */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1585 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1586 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1587 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1588
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1589 /* 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
1590 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
1591 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
1592
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1593 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
1594
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1595 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1596 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
1597 FRAME_PTR f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1598 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1599 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1600 struct buffer *old = current_buffer;
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1601 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1602 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
1603
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1604 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
1605 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1606
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1607 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1608 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1609
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
1610 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
1611 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
1612 #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
1613 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
1614 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
1615 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
1616 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
1617 : FRAME_MENU_BAR_LINES (f) > 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1618 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1619 /* 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
1620 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
1621 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
1622 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
1623 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
1624 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
1625 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1626 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
1627 || !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
1628 || ((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
1629 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1630 != !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
1631 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
1632 && !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
1633 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1634 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1635 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
1636 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
1637
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
1638 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
1639 if (save_match_data)
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
1640 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
1641 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1642 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1643 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1644 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
1645 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1646
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1647 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1648 call1 (Vrun_hooks, Qactivate_menubar_hook);
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1649 /* 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
1650 really recompute the menubar from the value. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1651 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
1652 call0 (Qrecompute_lucid_menubar);
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
1653 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
1654 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
1655 /* 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
1656 #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
1657 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
1658 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
1659 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1660 /* 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
1661 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
1662 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1663 #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
1664 /* 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
1665 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
1666 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
1667 #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
1668
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
1669 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
1670 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1671 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1672 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1673 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1674
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1675 int do_id = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1676
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1677 /* Redisplay WINDOW and its subwindows and siblings. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1678
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1679 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1680 redisplay_windows (window, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1681 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1682 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1684 for (; !NILP (window); window = XWINDOW (window)->next)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1685 redisplay_window (window, 0, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1686 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1687
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1688 /* 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
1689 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
1690 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
1691 macro DISP_CHAR_VECTOR. */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1692 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1693 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
1694 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
1695 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1696 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1697 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1698 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1699
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1700 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
1701
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1702 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
1703 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
1704 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1705 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
1706 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
1707 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1708 /* 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
1709 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
1710 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
1711 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
1712 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1713 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1714
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1715 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
1716 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1717 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
1718 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
1719 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
1720 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1721 /* 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
1722 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1723 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
1724
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1725 /* Redisplay window WINDOW and its subwindows. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1726
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727 static void
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1728 redisplay_window (window, just_this_one, preserve_echo_area)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 Lisp_Object window;
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
1730 int just_this_one, preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 register struct window *w = XWINDOW (window);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1733 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734 int height;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1735 int lpoint = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1736 int lpoint_byte = PT_BYTE;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1737 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
1738 register int width = window_internal_width (w) - 1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1739 register int startp, startp_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1740 register int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1741 struct position pos;
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1742 int opoint = PT;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1743 int opoint_byte = PT_BYTE;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1744 int tem;
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1745 int update_mode_line;
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1746 struct Lisp_Char_Table *dp = window_display_table (w);
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1747 int really_switched_buffer = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1748
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1749 if (Z == Z_BYTE && lpoint != lpoint_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1750 abort ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1751 if (lpoint_byte < lpoint)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1752 abort ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1753
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1754 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 /* If this is a combination window, do its children; that's all. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1757
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1758 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1759 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1760 redisplay_windows (w->vchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1761 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1762 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1763 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1764 {
14682
d5e14cf7a990 (redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents: 14662
diff changeset
1765 redisplay_windows (w->hchild, preserve_echo_area);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1766 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1767 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1768 if (NILP (w->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1769 abort ();
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1770
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1771 height = window_internal_height (w);
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
1772 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
1773 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
1774 update_mode_line = 1;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1775
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1776 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1777 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1778 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
1779 /* 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
1780 goto finish_scroll_bars;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1781 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1782 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1783 /* 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
1784 so clear it. */
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
1785 int vpos = XFASTINT (w->top);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1786 int i;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1787
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1788 for (i = 0; i < height; i++)
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1789 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1790 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
1791 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
1792 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
1793 0, 1, 0, width, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1794 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1795
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1796 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1797 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1798 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1799
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1800 /* Otherwise set up data on this window; select its buffer and point value */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1801
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1802 if (update_mode_line)
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1803 /* Really select the buffer, for the sake of buffer-local variables. */
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1804 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1805 set_buffer_internal_1 (XBUFFER (w->buffer));
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1806 really_switched_buffer = 1;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1807 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1808 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1809 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
1810
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
1811 opoint = PT;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1812 opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1813
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1814 if (Z == Z_BYTE && opoint != opoint_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1815 abort ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1816 if (opoint_byte < opoint)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1817 abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1819 /* 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
1820 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1821 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1822 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1823 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1824 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1825 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1826 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1827 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
1828
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1829 /* 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
1830 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
1831
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1832 if (!just_this_one)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1833 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1834 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1835 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1836 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
1837 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1838 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1839 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1840 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1841 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1842 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
1843 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 /* POINT refers normally to the selected window.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 For any other window, set up appropriate value. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1850 int new_pt = XMARKER (w->pointm)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1851 int new_pt_byte = marker_byte_position (w->pointm);
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1852 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1854 new_pt = BEGV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1855 new_pt_byte = BEGV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1856 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1858 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1860 new_pt = ZV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1861 new_pt_byte = ZV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1862 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1863 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
1864 /* We don't use SET_PT so that the point-motion hooks don't run. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1865 TEMP_SET_PT_BOTH (new_pt, new_pt_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1866 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1868 /* 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
1869 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
1870 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
1871 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
1872 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
1873 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
1874 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
1875 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
1876
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1877 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
1878 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
1879 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1880 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
1881 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
1882 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1883 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
1884 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1885 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
1886
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891 startp = marker_position (w->start);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1892 startp_byte = marker_byte_position (w->start);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1894 /* 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
1895 check whether it can be used. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1896 if (!NILP (w->optional_new_start))
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1897 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1898 w->optional_new_start = Qnil;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1899 /* 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
1900
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1901 pos = *compute_motion (startp, 0,
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1902 (((EQ (window, minibuf_window)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1903 && startp == BEG)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1904 ? minibuf_prompt_width : 0)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1905 + (hscroll ? 1 - hscroll : 0)),
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1906 0,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1907 PT, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1908 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1909 Fpos_visible_in_window_p (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
1910 - (1 << (BITS_PER_SHORT - 1)),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1911 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1912 pos_tab_offset (w, startp, startp_byte), w);
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1913 /* 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
1914 so do so by setting force_start. */
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1915 if (pos.bufpos == PT)
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1916 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1917 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
1918
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1919 /* 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
1920 unless the specified location is outside the accessible range. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1921 if (!NILP (w->force_start))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1922 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1923 w->force_start = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1924 /* 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
1925 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
1926 /* 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
1927 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
1928 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
1929 /* 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
1930 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
1931 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
1932 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
1933 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1934 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1935 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1936 Lisp_Object temp[3];
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
1937
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1938 if (!really_switched_buffer)
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1939 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1940 set_buffer_temp (old);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1941 set_buffer_internal_1 (XBUFFER (w->buffer));
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1942 }
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
1943 really_switched_buffer = 1;
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1944 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1945 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
1946 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1947 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1948 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
1949 make_number (startp));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1950 startp = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
1951 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
1952 }
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
1953 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
1954 XSETFASTINT (w->last_overlay_modified, 0);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1955 if (startp < BEGV) startp = BEGV, startp_byte = BEGV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1956 if (startp > ZV) startp = ZV, startp = ZV_BYTE;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1957 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1958 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 /* If point does not appear, move point so it does appear */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 pos = *compute_motion (startp, 0,
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1962 (((EQ (window, minibuf_window)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1963 && startp == BEG)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1964 ? minibuf_prompt_width : 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1965 + (hscroll ? 1 - hscroll : 0)),
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1966 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
1967 ZV, height / 2,
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13266
diff changeset
1968 - (1 << (BITS_PER_SHORT - 1)),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1969 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1970 pos_tab_offset (w, startp, startp_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1971 w);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1972 TEMP_SET_PT_BOTH (pos.bufpos, pos.bytepos);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1973 if (w != XWINDOW (selected_window))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1974 set_marker_both (w->pointm, Qnil, PT, PT_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1975 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1976 {
5340
fcd6e0da3380 (redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents: 5230
diff changeset
1977 if (current_buffer == old)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1978 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1979 lpoint = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1980 lpoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
1981 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
1982 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
1983 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1984 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1985 }
9218
db4473eb2265 (redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents: 9104
diff changeset
1986 /* 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
1987 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
1988 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
1989 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1990 {
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1991 cancel_my_columns (XWINDOW (window));
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1992 try_window (window, startp);
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
1993 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1994 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1995 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1996 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1997
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 /* 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
1999 and it has not moved off the frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001 /* This code is not used for minibuffer for the sake of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2002 the case of redisplaying to replace an echo area message;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003 since in that case the minibuffer contents per se are usually unchanged.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004 This code is of no real use in the minibuffer since
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 the handling of this_line_bufpos, etc.,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 in redisplay handles the same cases. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 if (XFASTINT (w->last_modified) >= MODIFF
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
2009 && 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
2010 && 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
2011 && (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
2012 /* 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
2013 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
2014 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
2015 && 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
2016 /* 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
2017 && !(!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
2018 && 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
2019 /* 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
2020 && 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
2021 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height)
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
2022 && !EQ (window, minibuf_window)
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
2023 && (!MARKERP (Voverlay_arrow_position)
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
2024 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 {
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
2026 /* 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
2027
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2028 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
2029 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
2030 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
2031
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2032 /* 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
2033 /* 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
2034 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
2035 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
2036 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
2037 pos.hpos = last_point_x;
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
2038 pos.vpos = last_point_y;
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2039 pos.bufpos = PT;
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2040 }
19225
b7e0b35c59d0 (redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents: 19205
diff changeset
2041 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
2042 && 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
2043 /* 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
2044 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
2045 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
2046 && !(last_point_x <= 0 && hscroll))
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2047 {
21290
2601d6057ec6 (redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21280
diff changeset
2048 int last_point = XFASTINT (w->last_point);
2601d6057ec6 (redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21280
diff changeset
2049 int last_point_byte = CHAR_TO_BYTE (last_point);
21335
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
2050 int tab_offset = (pos_tab_offset (w, last_point, last_point_byte)
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
2051 - (last_point_x + hscroll - !! hscroll));
21290
2601d6057ec6 (redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21280
diff changeset
2052
2601d6057ec6 (redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 21280
diff changeset
2053 pos = *compute_motion (last_point, 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
2054 PT, height,
21335
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
2055 /* BUG FIX: See the comment of
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2056 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
2057 - (1 << (BITS_PER_SHORT - 1)),
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2058 width, hscroll,
21335
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
2059 tab_offset,
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2060 w);
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2061 }
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2062 else
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2063 {
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2064 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
2065 PT, height,
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2066 /* BUG FIX: See the comment of
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2067 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
2068 - (1 << (BITS_PER_SHORT - 1)),
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2069 width, hscroll,
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2070 pos_tab_offset (w, startp, startp_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2071 w);
19015
533ccefb099d (redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents: 18994
diff changeset
2072 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2073
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2074 /* 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
2075 if (this_scroll_margin < 0)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2076 this_scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2077
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2078 if (XINT (w->height) < 4 * scroll_margin)
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2079 this_scroll_margin = XINT (w->height) / 4;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2080
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2081 /* 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
2082 we are ok. */
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2083 if (pos.vpos < height - this_scroll_margin
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
2084 && (pos.vpos >= this_scroll_margin || startp == BEGV))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2085 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2086 /* Ok, point is still on frame */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2087 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2088 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2089 /* 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
2090 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w)
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2091 + minmax (0, pos.hpos, width));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2092 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2093 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2094 /* 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
2095 this one must be redisplayed, this does nothing because there
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2096 is nothing in DesiredFrame yet, and then the other window is
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2097 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
2098 if (WINDOW_FULL_WIDTH_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099 preserve_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2100 */
20130
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2101 if (current_buffer->clip_changed
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2102 && ! NILP (Vwindow_scroll_functions))
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2103 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
2104 make_number (marker_position (w->start)));
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2105
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2106 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2108 /* Don't bother trying redisplay with same start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 we already know it will lose */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2110 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2111 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2113 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
2114 && !(startp <= BEGV
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2115 || FETCH_BYTE (startp_byte - 1) == '\n'))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2118 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2119 else if (just_this_one && !MINI_WINDOW_P (w)
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2120 && PT >= startp
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 && 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
2122 /* 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
2123 && ! NILP (w->start_at_line_beg)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124 && ! 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
2125 && do_id && !current_buffer->clip_changed
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 && !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
2127 && 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
2128 /* 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
2129 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2130 && !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
2131 /* 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
2132 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
2133 && !(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
2134 && NILP (w->region_showing)
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
2135 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 && EQ (last_arrow_string, Voverlay_arrow_string)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2137 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2138 && tem != -2)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2139 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2140 /* tem > 0 means success. tem == -1 means choose new start.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2141 tem == -2 means try again with same start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2142 and nothing but whitespace follows the changed stuff.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2143 tem == 0 means try again with same start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2144 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2147 else if (startp >= BEGV && startp <= ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2148 && (startp < ZV
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2149 /* Avoid starting at end of buffer. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2150 #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
2151 It will have to be considered later. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2152 || ! EQ (window, selected_window)
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2153 /* Don't do the recentering if redisplay
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2154 is not for no user action. */
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2155 || preserve_echo_area
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2156 #endif
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
2157 || startp == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
2158 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
2159 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2160 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2161 /* Try to redisplay starting at same place as before */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2162 /* If point has not moved off frame, accept the results */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2163 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2164 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2165 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2166 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2167 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2168 /* 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
2169 w->base_line_number = Qnil;
20130
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2170
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2171 if (current_buffer->clip_changed
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2172 && ! NILP (Vwindow_scroll_functions))
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2173 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
2174 make_number (marker_position (w->start)));
422958809490 (redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents: 20039
diff changeset
2175
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2176 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2177 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2178 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2180 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2182 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
2183 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
2184 /* 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
2185 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2186 {
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2187 if (!really_switched_buffer)
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2188 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2189 set_buffer_temp (old);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2190 set_buffer_internal_1 (XBUFFER (w->buffer));
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2191 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2192 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2193 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2194 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2195
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2196 /* Try to scroll by specified few lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2197
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2198 if (scroll_conservatively && !current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2199 && startp >= BEGV && startp <= ZV)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2200 {
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2201 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
2202 int scroll_margin_pos;
16570
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2203
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2204 /* 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
2205 if (this_scroll_margin < 0)
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2206 this_scroll_margin = 0;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2207
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2208 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
2209 this_scroll_margin = XINT (w->height) / 4;
f1f1c509a8f2 (redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents: 16560
diff changeset
2210
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2211 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
2212 if (this_scroll_margin)
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2213 {
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2214 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
2215 scroll_margin_pos = pos.bufpos;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2216 }
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2217 if (PT >= scroll_margin_pos)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2218 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2219 struct position pos;
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2220 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
2221 PT, XFASTINT (w->height), 0,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2222 XFASTINT (w->width), XFASTINT (w->hscroll),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2223 pos_tab_offset (w, startp, startp_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2224 w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2225 if (pos.vpos > scroll_conservatively)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2226 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2227
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2228 pos = *vmotion (startp, pos.vpos + 1, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2229
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2230 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2231 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2232 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2233 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2234 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2235 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2236 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2237 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2238 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2239 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2240 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2241 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2242 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2243 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2244 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2245 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2246 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2247 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2248 }
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2249
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2250 scroll_margin_pos = startp;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2251 if (this_scroll_margin)
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2252 {
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2253 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
2254 scroll_margin_pos = pos.bufpos;
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2255 }
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2256 if (PT < scroll_margin_pos)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2257 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2258 struct position pos;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2259 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
2260 scroll_margin_pos, XFASTINT (w->height), 0,
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2261 XFASTINT (w->width), XFASTINT (w->hscroll),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2262 pos_tab_offset (w, startp, startp_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2263 w);
19061
e2be10e9bf9d (redisplay_window): Fix one-off in handling
Richard M. Stallman <rms@gnu.org>
parents: 19045
diff changeset
2264 if (pos.vpos > scroll_conservatively)
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2265 goto scroll_fail_1;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2266
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
2267 pos = *vmotion (startp, -pos.vpos, w);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2268
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2269 if (! NILP (Vwindow_scroll_functions))
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2270 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2271 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos);
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2272 run_hook_with_args_2 (Qwindow_scroll_functions, window,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2273 make_number (pos.bufpos));
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2274 pos.bufpos = marker_position (w->start);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2275 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2276 try_window (window, pos.bufpos);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2277 if (cursor_vpos >= 0)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2278 {
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2279 if (!just_this_one || current_buffer->clip_changed
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2280 || beg_unchanged < startp)
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2281 /* Forget any recorded base line for line number display. */
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2282 w->base_line_number = Qnil;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2283 goto done;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2284 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2285 else
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2286 cancel_my_columns (w);
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2287 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2288 scroll_fail_1: ;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2289 }
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
2290
13760
7c7cc29b994e (redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents: 13733
diff changeset
2291 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
2292 && startp >= BEGV && startp <= ZV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2293 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2294 if (PT > startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2295 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2296 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2297 if (pos.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2298 goto scroll_fail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2299 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2301 pos = *vmotion (startp, (PT < startp ? - scroll_step : scroll_step), w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2302
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2303 if (PT >= pos.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2304 {
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
2305 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2306 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2307 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos);
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2308 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
2309 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2310 pos.bufpos = marker_position (w->start);
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2311 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2312 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2314 {
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2315 if (!just_this_one || current_buffer->clip_changed
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
2316 || beg_unchanged < startp)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2317 /* 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
2318 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2319 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2320 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 scroll_fail: ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2326
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 /* Finally, just choose place to start which centers point */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2329 recenter:
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2330 /* 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
2331 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2332
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2333 pos = *vmotion (PT, - (height / 2), w);
20259
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2334
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2335 /* The minibuffer is often just one line. Ordinary scrolling
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2336 gives little overlap and looks bad. So show 20 chars before point. */
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2337 if (height == 1
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2338 && (pos.bufpos >= PT - minibuffer_scroll_overlap
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2339 /* If we scrolled less than 1/2 line forward, we will
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2340 get too much overlap, so change to the usual amount. */
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2341 || pos.bufpos < startp + width / 2)
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2342 && PT > BEGV + minibuffer_scroll_overlap
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2343 /* If we scrolled to an actual line boundary,
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2344 that's different; don't ignore line boundaries. */
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2345 && FETCH_BYTE (pos.bytepos - 1) != '\n')
20580
5cf53b5a6bde (redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20536
diff changeset
2346 {
5cf53b5a6bde (redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20536
diff changeset
2347 pos.bufpos = PT - minibuffer_scroll_overlap;
5cf53b5a6bde (redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20536
diff changeset
2348 pos.bytepos = CHAR_TO_BYTE (pos.bufpos);
5cf53b5a6bde (redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20536
diff changeset
2349 }
20259
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
2350
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
2351 /* 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
2352 in case the window-scroll-functions functions get errors. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2353 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos);
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
2354 if (! NILP (Vwindow_scroll_functions))
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2355 {
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2356 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
2357 make_number (pos.bufpos));
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2358 pos.bufpos = marker_position (w->start);
20580
5cf53b5a6bde (redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20536
diff changeset
2359 pos.bytepos = marker_byte_position (w->start);
14614
8fda783ead43 (redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents: 14559
diff changeset
2360 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2361 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2362
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2363 startp = marker_position (w->start);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2364 startp_byte = marker_byte_position (w->start);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2365 w->start_at_line_beg
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2366 = (startp == BEGV || FETCH_BYTE (startp_byte - 1) == '\n') ? Qt : Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2367
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368 done:
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2369 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2370 /* 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
2371 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
2372 || (!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
2373 || 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
2374 || (!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
2375 && XFASTINT (w->column_number_displayed) != current_column ()))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2376 && height != XFASTINT (w->height))
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2377 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2378 FRAME_PTR oframe = selected_frame;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2379 if (!really_switched_buffer)
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2380 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2381 set_buffer_temp (old);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2382 set_buffer_internal_1 (XBUFFER (w->buffer));
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2383 really_switched_buffer = 1;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2384 }
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2385 selected_frame = f;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2386 display_mode_line (w);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2387 selected_frame = oframe;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2388 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2389 if (! line_number_displayed
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2390 && ! BUFFERP (w->base_line_pos))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2391 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2392 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2393 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2394 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2396 /* 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
2397 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
2398 && (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
2399 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
2400 #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
2401 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
2402 #else
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2403 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
2404 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2405 : FRAME_MENU_BAR_LINES (f) > 0)
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2406 && EQ (FRAME_SELECTED_WINDOW (f), window))
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2407 display_menu_bar (w);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2408
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2409 finish_scroll_bars:
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2410 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
2411 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2412 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2413
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2414 /* 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
2415 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
2416 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
2417 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
2418 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2419
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2420 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
2421 if (! MINI_WINDOW_P (w)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2422 || (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
2423 {
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
2424 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2425 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
2426 /* 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
2427 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
2428 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
2429
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
2430 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
2431 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
2432 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2433 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2434 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2435
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2436 /* 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
2437 (*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
2438
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2439 /* 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
2440 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
2441 (*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
2442 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2443
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2444 TEMP_SET_PT_BOTH (opoint, opoint_byte);
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
2445 if (really_switched_buffer)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
2446 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
2447 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
2448 set_buffer_temp (old);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2449 TEMP_SET_PT_BOTH (lpoint, lpoint_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 /* Do full redisplay on one window, starting at position `pos'. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2454 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2455 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2456 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2457 register int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2458 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2459 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2460 register int height = window_internal_height (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2461 register int vpos = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2462 register int last_text_vpos = vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2463 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
2464 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2465 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2466
16738
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2467 /* 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
2468 if (pos < XBUFFER (w->buffer)->begv
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2469 || pos > XBUFFER (w->buffer)->zv)
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2470 abort ();
9372cff55355 (try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents: 16660
diff changeset
2471
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2472 if (XMARKER (w->start)->charpos != pos)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2473 Fset_marker (w->start, make_number (pos), Qnil);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2474
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2477 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2478 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
2479 val.ovstring_chars_done = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2480 val.bytepos = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2481 val.tab_offset = pos_tab_offset (w, pos, val.bytepos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 while (--height >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2485 val = *display_text_line (w, pos, val.bytepos, vpos,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2486 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
2487 val.ovstring_chars_done);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2488 /* 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
2489 in VAL. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2490 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2491 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2492 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2493 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2494 vpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2495 if (pos != val.bufpos)
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2496 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2497 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
2498 #ifdef USE_TEXT_PROPERTIES
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2499 Lisp_Object invis_prop;
21534
7784f9b030a8 (try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
2500 invis_prop = Fget_char_property (make_number (val.bufpos - 1),
7784f9b030a8 (try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
2501 Qinvisible, window);
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2502 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
2503 #endif
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2504
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2505 last_text_vpos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2506 /* 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
2507 = vpos - (val.vpos
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2508 && (FETCH_BYTE (val.bytepos - 1) != '\n' || invis));
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
2509 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2510 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2511 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2512
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2514 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2516 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2517
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2518 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2520 && Z != pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2523 /* 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
2524 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
2525 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2527 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2529
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 /* Try to redisplay when buffer is modified locally,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2531 computing insert/delete line to preserve text outside
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2532 the bounds of the changes.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2533 Return 1 if successful, 0 if if cannot tell what to do,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 or -1 to tell caller to find a new window start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535 or -2 to tell caller to do normal redisplay with same window start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2536
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2537 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2538 try_window_id (window)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2539 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2540 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2541 int pos, pos_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2542 int opoint, opoint_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2543 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2544 register int height = window_internal_height (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2545 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2546 int top = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 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
2548 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549 int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2550 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2551 int did_motion;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2552 register int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2553 register int i, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 int last_text_vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2555 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
2556 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
2557 ? 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
2558 : !NILP (current_buffer->selective_display) ? -1 : 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2559 struct position val, bp, ep, xp, pp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2560 int scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2561 int delta;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2562 int epto, old_tick;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2564 int start_byte = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2565
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566 if (GPT - BEG < beg_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2567 beg_unchanged = GPT - BEG;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2568 if (Z - GPT < end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2569 end_unchanged = Z - GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2570
5739
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
2571 if (beg_unchanged + BEG < start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 return 0; /* Give up if changes go above top of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 /* Find position before which nothing is changed. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2575 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
2576 min (ZV, beg_unchanged + BEG), height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2577 /* BUG FIX: See the comment of
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2578 Fpos_visible_in_window_p (window.c). */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2579 - (1 << (BITS_PER_SHORT - 1)),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2580 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2581 pos_tab_offset (w, start, start_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2582 w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2583 if (bp.vpos >= height)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2584 {
11111
e3022a32d11d (try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents: 11108
diff changeset
2585 if (PT < bp.bufpos)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2586 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
2587 /* 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
2588 We don't need to change the text at all.
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2589 But we need to update window_end_pos to account for
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2590 any change in buffer size. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2591 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
2592 ZV, height,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2593 /* BUG FIX: See the comment of
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2594 Fpos_visible_in_window_p() (window.c). */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2595 - (1 << (BITS_PER_SHORT - 1)),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2596 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2597 pos_tab_offset (w, start, start_byte), w);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2598 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
2599 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
2600 goto findpoint;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2601 }
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2602 return 0;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2603 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2604
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2605 vpos = bp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2606
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2607 /* Find beginning of that frame line. Must display from there. */
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2608 bp = *vmotion (bp.bufpos, 0, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2609
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2610 pos = bp.bufpos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2611 pos_byte = bp.bytepos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2612 val.hpos = lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2613 if (pos < start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2614 return -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2615
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2616 did_motion = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2617 /* 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
2618 really start with previous frame line, in case it was not
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2619 continued when last redisplayed */
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2620 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2621 ||
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2622 /* 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
2623 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2624 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2625 bp = *vmotion (bp.bufpos, -1, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2626 --vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2627 pos = bp.bufpos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2628 pos_byte = bp.bytepos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2629 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2630 val.tab_offset = bp.tab_offset; /* Update tab offset. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2631
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632 if (bp.contin && bp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2634 val.hpos = bp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2635 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
2636 did_motion = 1;
21028
0e9e9906db7b (try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 20997
diff changeset
2637 DEC_BOTH (pos, pos_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2638 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2639
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2640 bp.vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2642 /* Find first visible newline after which no more is changed. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2643 opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2644 SET_PT (Z - max (end_unchanged, Z - ZV));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2645 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1);
5942
c51e1ff87656 (try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents: 5936
diff changeset
2646 if (selective > 0)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2647 while (PT < ZV - 1 && indented_beyond_p (PT, PT_BYTE, selective))
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2648 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2649 tem = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2650 SET_PT_BOTH (opoint, opoint_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2651
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2652 /* Compute the cursor position after that newline. */
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2653 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
2654 height, - (1 << (BITS_PER_SHORT - 1)),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2655 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2656 /* 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
2657 val.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2658
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2659 /* If changes reach past the text available on the frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2660 just display rest of frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 if (ep.bufpos > Z - XFASTINT (w->window_end_pos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2663 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2664 stop_vpos = ep.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2665
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2666 /* If no newline before ep, the line ep is on includes some changes
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2667 that must be displayed. Make sure we don't stop before it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2668 /* Also, if changes reach all the way until ep.bufpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2669 it is possible that something was deleted after the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2670 newline before it, so the following line must be redrawn. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2671 if (stop_vpos == ep.vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2672 && (ep.bufpos == BEGV
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2673 || FETCH_BYTE (ep.bytepos - 1) != '\n'
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2674 || ep.bufpos == Z - end_unchanged))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2675 stop_vpos = ep.vpos + 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2676
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2677 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2678 overlay_arrow_seen = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2679 zv_strings_seen = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2680
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2681 /* If changes do not reach to bottom of window,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2682 figure out how much to scroll the rest of the window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2683 if (stop_vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2684 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2685 /* 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
2686 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2687 Z - XFASTINT (w->window_end_pos),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2688 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2689 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2690 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2691 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2692 width, hscroll, ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2693 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2694
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2695 /* Is everything on frame below the changes whitespace?
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2696 If so, no scrolling is really necessary. */
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2697 for (i = ep.bytepos; i < xp.bytepos; i++)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2698 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2699 tem = FETCH_BYTE (i);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2700 if (tem != ' ' && tem != '\n' && tem != '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2701 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2702 }
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2703 if (i == xp.bytepos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2704 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2705
9330
28fcacb58a38 (try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9325
diff changeset
2706 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
2707 XFASTINT (w->window_end_vpos) + scroll_amount);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2708
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2709 /* 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
2710 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2711 {
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2712 if (PT <= xp.bufpos)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2713 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2714 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
2715 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
2716 width, hscroll,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2717 /* 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
2718 ep.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2719 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2720 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2721 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2722 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
2723 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
2724 width, hscroll,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2725 /* 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
2726 xp.tab_offset, w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2727 }
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2728 if (pp.bufpos < PT || pp.vpos == height)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2729 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2730 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
2731 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2732 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2733
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2734 if (stop_vpos - scroll_amount >= height
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2735 || ep.bufpos == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2737 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2738 stop_vpos -= scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2739 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2740 /* In this path, we have altered window_end_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2741 and not left it negative.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2742 We must make sure that, in case display is preempted
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2743 before the frame changes to reflect what we do here,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 further updates will not come to try_window_id
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2745 and assume the frame and window_end_vpos match. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2746 blank_end_of_window = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2747 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2748 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
2749 {
a406a09cb770 (redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents: 6643
diff changeset
2750 /* 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
2751 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
2752 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
2753 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
2754 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
2755 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
2756 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2757 else if (bp.bufpos == Z - end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2758 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2759 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2760 don't bother scrolling. Can happen if lines are short. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2761 if (scroll_cost (f, bp.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2762 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2763 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2764 > xp.bufpos - bp.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2765 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2766 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2767 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2768 /* If pure deletion, scroll up as many lines as possible.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2769 In common case of killing a line, this can save the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2770 following line from being overwritten by scrolling
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2771 and therefore having to be redrawn. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2772 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
2773 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
2774 scroll_amount, bp.bufpos);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2775 if (!tem)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2776 stop_vpos = height;
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2777 else
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2778 {
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2779 /* 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
2780 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
2781 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
2782 (This can happen in a deletion that ends in mid-line.)
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2783 To adjust properly, we need to make things consistent
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13833
diff changeset
2784 at the position ep.
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2785 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
2786 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
2787 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
2788 int oldstart
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2789 = 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
2790 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
2791 ep.bufpos - oldstart);
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
2792 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2793 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2794 else if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2795 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2796 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2797 don't bother scrolling. Can happen if lines are short. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2798 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2799 overestimate of cost of reprinting, since xp.bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2800 would end up below the bottom of the window. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2801 if (scroll_cost (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2802 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2803 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2804 > xp.bufpos - ep.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2805 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2806 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2807 return -2;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2808 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2809 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
2810 scroll_amount, ep.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2811 if (!tem) stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2812 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2813 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2814
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2815 /* In any case, do not display past bottom of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2816 if (stop_vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2817 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2818 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2819 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2820 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2821
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2822 /* Handle case where pos is before w->start --
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2823 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
2824 if (vpos == 0 && pos < marker_position (w->start))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2825 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2826
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2827 val.bytepos = pos_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2828
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2829 /* Redisplay the lines where the text was changed */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2830 last_text_vpos = vpos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2831 /* 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
2832 val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2833 #if 0
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2834 tab_offset = pos_tab_offset (w, pos, pos_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2835 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2836 to account for passing the line that that character really starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2837 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2838 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2839 #endif /* 0 */
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2840 old_tick = MODIFF;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2841 while (vpos < stop_vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2842 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2843 val = *display_text_line (w, pos, val.bytepos, top + vpos++,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2844 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
2845 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
2846 /* 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
2847 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
2848 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
2849 if (old_tick != MODIFF)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
2850 stop_vpos = height;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2851 /* 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
2852 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2853 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2854 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2855 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2856 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2857 if (pos != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2858 last_text_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2859 /* Next line, unless prev line ended in end of buffer with no cr */
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2860 = vpos - (val.vpos && FETCH_BYTE (val.bytepos - 1) != '\n');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2861 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2862 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2863
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2864 /* There are two cases:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2865 1) we have displayed down to the bottom of the window
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2866 2) we have scrolled lines below stop_vpos by scroll_amount */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2867
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2868 if (vpos == height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2869 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2870 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2871 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2872 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2873 val.bufpos++;
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
2874 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
2875 XSETFASTINT (w->window_end_pos, Z - val.bufpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2876 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2877
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2878 /* If scrolling made blank lines at window bottom,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2879 redisplay to fill those lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2880 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2881 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2882 /* Don't consider these lines for general-purpose scrolling.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2883 That will save time in the scrolling computation. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2884 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2885 vpos = xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2886 pos = xp.bufpos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2887 pos_byte = xp.bytepos;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2888 val.hpos = xp.hpos;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2889 val.tab_offset = xp.tab_offset;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2890 if (pos == ZV)
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2891 { /* Display from next line */
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2892 vpos = height + scroll_amount;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2893 val.hpos = lmargin;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2894 val.tab_offset = 0;
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
2895 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2896 else if (xp.contin && xp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2897 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2898 val.hpos = xp.prevhpos - width + lmargin;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2899 val.tab_offset = xp.tab_offset + bp.prevhpos - width;
21028
0e9e9906db7b (try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 20997
diff changeset
2900 DEC_BOTH (pos, pos_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2901 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2902
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2903 blank_end_of_window = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2904 /* 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
2905 in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2906 #if 0
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2907 tab_offset = pos_tab_offset (w, pos, pos_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2908 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2909 to account for passing the line that that character starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2910 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2911 tab_offset += width;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2912 #endif
21280
82fbf42bb989 (redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents: 21244
diff changeset
2913 val.bytepos = pos_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2914 while (vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2915 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2916 val = *display_text_line (w, pos, val.bytepos,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2917 top + vpos++, val.hpos,
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2918 val.tab_offset, val.ovstring_chars_done);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2919 /* 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
2920 offset in val.tab_offset. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2921 #if 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2922 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2923 if (val.vpos) tab_offset = 0;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2924 #endif /* 0 */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2925 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2926 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2927
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2928 /* Here is a case where display_text_line sets cursor_vpos wrong.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2929 Make it be fixed up, below. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2930 if (xp.bufpos == ZV
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
2931 && xp.bufpos == PT)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2932 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2933 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2934
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2935 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2936 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2937 && Z != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2938 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2939
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2940 /* Attempt to adjust end-of-text positions to new bottom line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2941 if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2942 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2943 delta = height - xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2944 if (delta < 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2945 || (delta > 0 && xp.bufpos <= ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2946 || (delta == 0 && xp.hpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2947 {
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2948 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
2949 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
2950 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
2951 XFASTINT (w->window_end_vpos) + val.vpos);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2952 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2953 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2954
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2955 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2956
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2957 /* If point was not in a line that was displayed, find it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2958 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2959 {
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
2960 findpoint:
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2961 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
2962 /* Don't care for VPOS... */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2963 1 << (BITS_PER_SHORT - 1),
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2964 /* ... nor HPOS. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
2965 1 << (BITS_PER_SHORT - 1),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2966 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2967 pos_tab_offset (w, start, start_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2968 w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2969 /* Admit failure if point is off frame now */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2970 if (val.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2971 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2972 for (vpos = 0; vpos < height; vpos++)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2973 cancel_line (vpos + top, f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2974 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2975 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2976 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
2977 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2978 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2979
11810
986414eefde0 (minmax): New macro.
Karl Heuer <kwzh@gnu.org>
parents: 11767
diff changeset
2980 FRAME_CURSOR_X (f) = cursor_hpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2981 FRAME_CURSOR_Y (f) = cursor_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2982
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2983 if (debug_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2984 {
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
2985 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
2986 height, - (1 << (BITS_PER_SHORT - 1)),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2987 width, hscroll,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2988 pos_tab_offset (w, start, start_byte),
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
2989 w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2990 if (val.vpos != XFASTINT (w->window_end_vpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2991 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2992 if (XFASTINT (w->window_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2993 != Z - val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2994 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2995 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2996
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2997 return 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2998 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2999
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3000 /* Copy LEN glyphs starting address FROM to the rope TO.
301
2fb0312f83c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 277
diff changeset
3001 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
3002 Value is TO, advanced past the copied data.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3003 F is the frame we are displaying in. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3004
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3005 static GLYPH *
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3006 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
3007 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3008 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
3009 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
3010 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
3011 int len;
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
3012 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
3013 {
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3014 int n = len;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3015 register Lisp_Object *fp = from;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3016 /* 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
3017 int last_code = -1;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3018 int last_merged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3019
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3020 #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
3021 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
3022 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
3023 {
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3024 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
3025 int facecode;
17179
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3026 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
3027
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3028 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
3029 /* 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
3030 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
3031
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3032 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
3033 /* 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
3034 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
3035 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
3036 /* 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
3037 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
3038 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3039 {
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3040 /* 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
3041 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
3042 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
3043 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3044
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3045 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
3046 *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
3047 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3048 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3049 }
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3050 else
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3051 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3052 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
3053 {
6741
840862375e93 (copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents: 6740
diff changeset
3054 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
3055 ++to;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3056 ++fp;
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3057 }
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3058 return to;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3059 }
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3060
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3061 /* 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
3062 with a displayable computed face code. */
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3063
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3064 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
3065 fix_glyph (f, glyph, cface)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3066 FRAME_PTR f;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3067 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
3068 int cface;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3069 {
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3070 #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
3071 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
3072 {
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
3073 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
3074 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
3075 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
3076 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3077 #endif
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
3078 return glyph;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3079 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3080
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3081 /* Return the column of position POS / POS_BYTE in window W's buffer.
21335
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
3082 When used on the character at the beginning of a line,
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
3083 starting at column 0, this says how much to subtract from
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
3084 the column position of any character in the line
8f9e7600c250 (redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents: 21310
diff changeset
3085 to get its horizontal position on the screen. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3086
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3087 static int
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3088 pos_tab_offset (w, pos, pos_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3089 struct window *w;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3090 register int pos, pos_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3091 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3092 int opoint = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3093 int opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3094 int col;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3095 int width = window_internal_width (w) - 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3096
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3097 if (pos == BEGV)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3098 return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3099
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3100 if (FETCH_BYTE (pos_byte - 1) == '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3101 return 0;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3102
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3103 TEMP_SET_PT_BOTH (pos, pos_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3104 col = current_column ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3105 TEMP_SET_PT_BOTH (opoint, opoint_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3106
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3107 return col;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3108 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3109
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3110 /* Display one line of window W, starting at char position START in W's buffer.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3111 START_BYTE is the corresponding byte position.
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3112
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3113 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
3114 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
3115 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
3116 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
3117 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
3118 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
3119 account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3120
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3121 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3122
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3123 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
3124 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
3125
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3126 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
3127 the top of the frame, not W.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3128
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3129 Returns a STRUCT POSITION giving character to start next line with
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3130 and where to display it, including a zero or negative hpos.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3131 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
3132
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3133 struct position val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3134
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3135 static struct position *
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3136 display_text_line (w, start, start_byte, vpos, hpos, taboffset, ovstr_done)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3137 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3138 int start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3139 int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3140 int hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3141 int taboffset;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3142 int ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3143 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3144 register int pos = start;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3145 int pos_byte = start_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3146 register int c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3147 register GLYPH *p1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3148 int pause, limit_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3149 register unsigned char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3150 GLYPH *endp;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3151 register GLYPH *leftmargin;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3152 register GLYPH *p1prev;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3153 register GLYPH *p1start;
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3154 GLYPH *p1_wide_column_end = (GLYPH *) 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3155 int prevpos, prevpos_byte;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3156 int *charstart;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3157 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3158 int tab_width = XINT (current_buffer->tab_width);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
3159 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
3160 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3161 struct position val;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3162 int lastpos, lastpos_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3163 int invis;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3164 int last_invis_skip = 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3165 Lisp_Object last_invis_prop;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 int hscroll = XINT (w->hscroll);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3167 int truncate = (hscroll
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3168 || (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
3169 && !WINDOW_FULL_WIDTH_P (w))
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3170 || !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
3171
20258
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3172 /* 1 if this buffer has a region to highlight. */
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3173 int highlight_region
16069
8fe5e69de92a (redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
3174 = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)
20258
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3175 && XMARKER (current_buffer->mark)->buffer != 0);
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3176 int region_beg, region_end;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3177
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3178 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
3179 ? 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
3180 : !NILP (current_buffer->selective_display) ? -1 : 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3181 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
3182 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
3183
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3184 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
3185 /* 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
3186 if it calls for an ellipsis.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3187 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
3188 selective display is enabled--you must check that separately. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3189 int selective_rlen
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3190 = (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
3191 ? 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
3192 : !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
3193 /* 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
3194 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
3195 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
3196 = (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
3197 ? 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
3198 : default_invis_vector);
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3199
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
3200 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
3201 || !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
3202 ? '$' : 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
3203 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
3204 || !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
3205 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3206
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3207 /* If 1, we must handle multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3208 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
3209 /* Length of multibyte form of each character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3210 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3211 /* 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
3212 displayed from right to left. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3213 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
3214 ? 0 : GLYPH_MASK_REV_DIR);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3215
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3216 /* 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
3217 to overlays or text property changes. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3218 int next_face_change;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3219
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3220 /* 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
3221 overlay starts or ends. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3222 int next_boundary;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3223
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3224 /* 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
3225 int current_face = 0;
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3226 int i;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3227
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
3228 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
3229 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
3230
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
3231 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
3232 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3233
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3234 /* Show where to highlight the region. */
20258
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3235 if (highlight_region
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
3236 /* 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
3237 && (highlight_nonselected_windows
20258
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3238 || w == XWINDOW (selected_window)
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3239 || (MINI_WINDOW_P (XWINDOW (selected_window))
ebebe05191b4 (display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents: 20130
diff changeset
3240 && w == XWINDOW (Vminibuf_scroll_window))))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3241 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3242 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
3243 if (PT < region_beg)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3244 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3245 region_end = region_beg;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3246 region_beg = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3247 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3248 else
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3249 region_end = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3250 w->region_showing = Qt;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3251 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3252 else
17679
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
3253 {
447ca1b334e5 (display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents: 17362
diff changeset
3254 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
3255 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
3256 }
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
3257
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3258 if (MINI_WINDOW_P (w)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3259 && start == BEG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3260 && vpos == XFASTINT (w->top))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3261 {
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
3262 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
3263 {
18994
015e9d877871 (display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents: 18865
diff changeset
3264 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
3265
6721
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3266 minibuf_prompt_width
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
3267 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data,
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
3268 STRING_BYTES (XSTRING (minibuf_prompt)),
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3269 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
3270 /* 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
3271 ' ',
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
3272 1, -1,
bd5dc931e46e (display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents: 9682
diff changeset
3273 /* 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
3274 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
3275 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
3276 (XFASTINT (w->width) > 10
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
3277 ? XFASTINT (w->width) - 4 : -1),
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
3278 STRING_MULTIBYTE (minibuf_prompt))
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3279 - 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
3280 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
3281 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
3282 }
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3283 else
26e4c96d8b63 (display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents: 6705
diff changeset
3284 minibuf_prompt_width = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3285 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3286
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3287 /* 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
3288 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
3289 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
3290 if (hpos < 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3291 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3292 struct position *left_edge
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3293 = compute_motion (pos, vpos, hpos, 0,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3294 ZV, vpos, 0,
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3295 width, hscroll, taboffset, w);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3296
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3297 /* 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
3298 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
3299 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
3300 the left margin.
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3301
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3302 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
3303 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
3304 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
3305 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
3306 || left_edge->hpos > 0)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3307 {
21028
0e9e9906db7b (try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 20997
diff changeset
3308 pos = left_edge->bufpos;
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3309 pos_byte = left_edge->bytepos;
21028
0e9e9906db7b (try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 20997
diff changeset
3310 DEC_BOTH (pos, pos_byte);
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3311 hpos = left_edge->prevhpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3312 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3313 else
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3314 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3315 pos = left_edge->bufpos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3316 pos_byte = left_edge->bytepos;
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3317 hpos = left_edge->hpos;
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3318 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3319 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3320
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3321 hpos += WINDOW_LEFT_MARGIN (w);
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
3322
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
3323 desired_glyphs->bufp[vpos] = start;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3324 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
3325 p1start = p1;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3326 charstart = desired_glyphs->charstarts[vpos] + hpos;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3327 /* 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
3328 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
3329 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
3330 endp = leftmargin + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3331
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
3332 /* 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
3333 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
3334 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
3335 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
3336 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
3337 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
3338
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3339 /* Loop generating characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3340 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
3341 if reach or pass continuation column,
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3342 or at face change. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3343 pause = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3344 limit_byte = pos_byte;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3345 next_face_change = pos;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3346 next_boundary = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3347 p1prev = p1;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3348 prevpos = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3349 prevpos_byte = pos_byte;
18829
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3350
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3351 /* 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
3352 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
3353 right away. */
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3354 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
3355 {
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3356 cursor_vpos = vpos;
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3357 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
3358 }
efc598630ee9 (display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents: 18761
diff changeset
3359
18730
492cb3baf591 (display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents: 18718
diff changeset
3360 while (p1 < endp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3361 {
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3362 if (pos >= pause)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3363 {
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3364 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
3365
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3366 while (pos == next_boundary)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3367 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3368 Lisp_Object position, limit, prop, ww;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3369
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3370 /* 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
3371 and have already displayed the appropriate strings
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3372 on an earlier line. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3373 if (pos < ZV || !zv_strings_seen++)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3374 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3375 int ovlen;
16245
d960549d163c (display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 16197
diff changeset
3376 unsigned char *ovstr;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3377 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
3378
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3379 if (ovlen > 0)
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3380 {
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3381 /* 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
3382 ovstr += ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3383 ovlen -= ovstr_done;
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3384
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3385 while (ovlen > 0)
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3386 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3387 int charset, cols;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3388 GLYPH g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3389
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3390 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3391 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3392 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
3393 ovstr += len, ovlen -= len, ovstr_done += len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3394 charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3395 cols = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3396 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3397 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3398 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3399 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3400 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3401 c = *ovstr++, ovlen--, ovstr_done++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3402 cols = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3403 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3404 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
3405 while (cols-- > 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3406 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3407 if (p1 >= leftmargin && p1 < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3408 *p1 = g, g |= GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3409 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3410 }
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3411 }
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3412 /* 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
3413 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
3414 just for neatness' sake. */
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
3415 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
3416 ovstr_done = 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3417 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3418 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3419
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3420 /* Did we reach point? Record the cursor location. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3421 if (pos == PT && cursor_vpos < 0)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3422 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3423 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3424 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3425 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3426
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3427 if (pos >= ZV)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3428 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3429
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3430 XSETFASTINT (position, pos);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3431 limit = Fnext_overlay_change (position);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3432 #ifdef USE_TEXT_PROPERTIES
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3433 /* This is just an estimate to give reasonable
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3434 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
3435 if (XFASTINT (limit) > pos + 50)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3436 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3437 int limitpos = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3438 XSETFASTINT (limit, limitpos);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3439 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3440 limit = Fnext_single_property_change (position, Qinvisible,
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3441 Fcurrent_buffer (), limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3442 #endif
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3443 next_boundary = XFASTINT (limit);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3444 /* 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
3445 the next property change. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3446 XSETWINDOW (ww, w);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3447 prop = Fget_char_property (position, Qinvisible, ww);
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3448 if (TEXT_PROP_MEANS_INVISIBLE (prop))
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3449 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3450 if (pos < PT && next_boundary >= PT)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3451 {
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3452 cursor_vpos = vpos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3453 cursor_hpos = p1 - leftmargin;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3454 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3455 pos = next_boundary;
20666
7e740edb4d52 (display_text_line): Set pos_byte with pos
Karl Heuer <kwzh@gnu.org>
parents: 20628
diff changeset
3456 pos_byte = CHAR_TO_BYTE (pos);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3457 last_invis_skip = pos;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3458 last_invis_prop = prop;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3459 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3460 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3461
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3462 /* Did we reach point? Record the cursor location. */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3463 if (pos == PT && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3464 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3465 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3466 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3467 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3468
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3469 /* 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
3470 Stop here. */
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3471 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
3472 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3473 /* 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
3474 /* 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
3475 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
3476 {
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3477 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
3478 ? leftmargin : p1)
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3479 - p1start];
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3480 *p2x++ = pos;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3481 }
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3482 break;
7aa9cdf40d37 (display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 12267
diff changeset
3483 }
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
3484
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3485 /* 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
3486 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
3487 if (MARKERP (w->redisplay_end_trigger)
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3488 && 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
3489 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
3490 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
3491 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
3492 else
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3493 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
3494
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3495 /* 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
3496 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
3497 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
3498 {
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3499 Lisp_Object args[3];
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3500
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3501 args[0] = Qredisplay_end_trigger_functions;
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3502 XSETWINDOW (args[1], w);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3503 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
3504
7167b8612c52 (display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents: 14036
diff changeset
3505 /* 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
3506 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
3507 w->redisplay_end_trigger = Qnil;
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3508 Frun_hook_with_args (3, args);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
3509
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3510 e_t_h = ZV;
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3511 /* 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
3512 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
3513 }
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3514
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3515 #ifdef HAVE_FACES
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3516 /* 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
3517 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
3518 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
3519 if (pos >= next_face_change
91662157e604 (redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents: 15245
diff changeset
3520 && (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
3521 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3522 int limit = pos + 50;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3523
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3524 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
3525 region_beg, region_end,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3526 &next_face_change, limit, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3527 }
13519
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3528 #endif
aee6ea2166bc (display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents: 13511
diff changeset
3529
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3530 /* 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
3531 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
3532
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3533 pause = ZV;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3534
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3535 if (pos < next_boundary && next_boundary < pause)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3536 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
3537 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
3538 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
3539
13266
d6bba071525c (try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents: 13196
diff changeset
3540 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
3541 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
3542
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3543 /* 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
3544 the phone? */
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3545 if (pos < PT && PT < pause)
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3546 pause = PT;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3547 if (pos < GPT && GPT < pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3548 pause = GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3549
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3550 /* LIMIT_BYTE is not the same place in the buffer as PAUSE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3551 It is a limit on valid characters.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3552 We use it to bound STRING_CHAR_AND_LENGTH. */
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3553 limit_byte = ZV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3554 if (pos < GPT && GPT_BYTE < limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3555 limit_byte = GPT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3556
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3557 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3558 int temp = CHAR_TO_BYTE (pos);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3559 p = BYTE_POS_ADDR (temp);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3560 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3561 }
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3562
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3563 if (p1 >= endp)
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3564 break;
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3565
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3566 p1prev = p1;
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3567 p1_wide_column_end = (GLYPH *) 0;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3568
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3569 if (multibyte)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3570 c = STRING_CHAR_AND_LENGTH (p, limit_byte - pos_byte, len), p += len;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3571 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3572 c = *p++, len = 1;
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3573 /* 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
3574 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
3575 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3576 p1 = copy_part_of_rope (f, p1, leftmargin,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3577 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3578 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
3579 current_face, rev_dir_bit);
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3580 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
3581 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3582 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3583 if (p1 >= leftmargin)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3584 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3585 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3586 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3587 else if (c == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3588 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3589 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3590 /* 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
3591 (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
3592 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
3593 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3594
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3595 invis = 0;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3596 if (last_invis_skip == pos
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
3597 && 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
3598 invis = 1;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3599 while (pos + 1 < ZV
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3600 && selective > 0
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3601 && indented_beyond_p (pos + 1, pos_byte + 1, selective))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3602 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3603 int opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3604
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3605 invis = 1;
20896
ec8cd27243b6 (display_text_line): Use INC_BOTH for unibyte buffers too.
Richard M. Stallman <rms@gnu.org>
parents: 20786
diff changeset
3606 INC_BOTH (pos, pos_byte);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3607 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1);
21478
54680b998295 (display_text_line): When handling selective > 0,
Karl Heuer <kwzh@gnu.org>
parents: 21443
diff changeset
3608 pos = PT, pos_byte = PT_BYTE;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3609 if (FETCH_BYTE (pos_byte - 1) == '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3610 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3611 pos--;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3612 pos_byte--;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3613 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3614 SET_PT_BOTH (opoint, opoint_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3615 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3616 if (invis && selective_rlen > 0 && p1 >= leftmargin)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3617 {
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3618 #if 0
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3619 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
3620
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3621 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
3622 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3623
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3625 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3626 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
3627
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3628 #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
3629 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
3630 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
3631 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
3632 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
3633 *cs++ = -2;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3634 /* 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
3635 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
3636 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
3637 #endif
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3638
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3639 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
3640 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3641 }
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3642
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3643 /* 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
3644 /* 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
3645 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
3646 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3647 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3648 /* 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
3649 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
3650 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
3651 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3652 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3653 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3654 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
3655
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3656 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3657 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3658 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3659 }
17846
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3660 #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
3661 /* 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
3662 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
3663 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
3664 {
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3665 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
3666 p1 = leftmargin;
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3667 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
3668 *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
3669 }
c427501449a1 (display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents: 17698
diff changeset
3670 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3671
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3672 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3674 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3675 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3676 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3677 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3678 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3679 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3680 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3681 }
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3682 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3683 % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3684 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3685 else if (c == Ctl ('M') && selective == -1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3686 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3687 int opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3688 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3689 pos = PT, pos_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3690 SET_PT_BOTH (opoint, opoint_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3691
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3692 if (FETCH_BYTE (pos_byte - 1) == '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3693 pos--, pos_byte--;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3694 if (selective_rlen > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3695 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3696 p1 += selective_rlen;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3697 if (p1 - leftmargin > width)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3698 p1 = endp;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3699 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
3700 (p1 - p1prev), current_face, rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3701 }
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
3702 #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
3703 /* 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
3704 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
3705 if (current_face)
7772
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3706 {
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3707 if (p1 < leftmargin)
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3708 p1 = leftmargin;
7821be0db092 (display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents: 7757
diff changeset
3709 while (p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3710 *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
3711 }
2884
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
3712 #endif
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3713
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3714 /* 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
3715 /* 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
3716 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
3717 if (p1 >= leftmargin && p1prev != endp)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3718 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3719 /* 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
3720 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
3721 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
3722 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3723 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3724 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3725 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
3726
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3727 *p2x++ = pos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3728 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3729 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3730 }
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
3731 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3732 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3733 else if (c < 0200 && ctl_arrow)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3734 {
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3735 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
3736 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
3737 (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
3738 && 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
3739 ? 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
3740 current_face)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3741 | rev_dir_bit);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3742 p1++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3743 if (p1 >= leftmargin && p1 < endp)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3744 *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
3745 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3746 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3747 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3748 {
21443
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3749 /* C is a multibyte character or a character to be displayed
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3750 by octral form. */
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3751 int remaining_bytes = len;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3752
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3753 if (c >= 0400)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3754 {
21443
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3755 /* C is a multibyte character. */
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3756 int charset = CHAR_CHARSET (c);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3757 int columns = (charset == CHARSET_COMPOSITION
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3758 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3759 : CHARSET_WIDTH (charset));
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3760 GLYPH g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3761
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3762 while (columns--)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3763 {
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3764 if (p1 >= leftmargin && p1 < endp)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3765 *p1 = g, g |= GLYPH_MASK_PADDING;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3766 p1++;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3767 }
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3768 p1_wide_column_end = p1;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3769 remaining_bytes -= CHARSET_BYTES (charset);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3770 }
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3771
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3772 while (remaining_bytes > 0)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3773 {
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3774 c = *(p - remaining_bytes--);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3775
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3776 if (p1 >= leftmargin && p1 < endp)
21443
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3777 *p1 = (fix_glyph
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3778 (f,
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3779 (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp))
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3780 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp)))
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3781 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3782 current_face)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3783 | rev_dir_bit);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3784 p1++;
21443
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3785 if (p1 >= leftmargin && p1 < endp)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3786 *p1 = (MAKE_GLYPH (f, (c >> 6) + '0', current_face)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3787 | rev_dir_bit);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3788 p1++;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3789 if (p1 >= leftmargin && p1 < endp)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3790 *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3791 | rev_dir_bit);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3792 p1++;
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3793 if (p1 >= leftmargin && p1 < endp)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3794 *p1 = (MAKE_GLYPH (f, (7 & c) + '0', current_face)
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3795 | rev_dir_bit);
3cb2644c8dd2 (display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents: 21424
diff changeset
3796 p1++;
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3797 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3798 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
3799
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
3800 prevpos = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3801 prevpos_byte = pos_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3802 pos++;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3803 pos_byte += len;
11874
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3804
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3805 /* 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
3806
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3807 /* 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
3808 if (p1 >= leftmargin)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3809 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3810 /* 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
3811 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
3812 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
3813 if (p1 != p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3814 {
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3815 int *p2x = &charstart[(p1prev < leftmargin
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3816 ? leftmargin : p1prev)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3817 - p1start];
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3818 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
3819
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3820 if (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3821 *p2x++ = prevpos;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3822 while (p2x < p2)
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3823 *p2x++ = -1;
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3824 }
b8de94b7c91f (display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents: 11854
diff changeset
3825 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3826 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828 val.hpos = - XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829 if (val.hpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3830 val.hpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3831
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832 val.vpos = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3834 lastpos = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3835 lastpos_byte = pos_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3836
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3837 /* 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
3838 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
3839 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
3840 /* 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
3841 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
3842 internal width. */
7292
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3843 i = p1 - p1start + 1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3844 if (p1 < leftmargin)
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3845 i += leftmargin - p1;
b5b5ca91f463 (display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents: 7197
diff changeset
3846 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
3847 charstart[i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
3848
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3849 /* Handle continuation in middle of a character */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3850 /* by backing up over it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3851 if (p1 > endp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3852 {
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3853 /* 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
3854 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
3855 if (p1prev)
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3856 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3857 /* 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
3858 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
3859 LEN. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3860 pos = prevpos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3861 pos_byte = prevpos_byte;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3862
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3863 if (p1_wide_column_end < endp)
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3864 /* As ENDP is not in the middle of wide-column character,
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3865 we can break the line at ENDP and start from the middle
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3866 column in the next line. So, adjust VAL.HPOS to skip
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3867 the columns output on this line. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3868 val.hpos += p1prev - endp;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3869 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3870 {
20926
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3871 /* We displayed a wide-column character at around ENDP.
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3872 Since we can't broke it in the middle, the whole
b304072b893c (try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents: 20896
diff changeset
3873 character should be driven into the next line. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3874 /* 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
3875 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
3876 must be adjusted. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3877 taboffset = taboffset + (p1prev - endp);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3878 /* 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
3879 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3880 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
3881 while (p1prev < endp)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3882 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3883 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3884 /* 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
3885 lastpos = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3886 lastpos_byte = pos_byte;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3887 if (PT == pos)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3888 cursor_vpos = -1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3889 }
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3890 }
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
3891
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3892 /* Keep in this line everything up to the continuation column. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893 p1 = endp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3894 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3895
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3896 /* Finish deciding which character to start the next line on,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3897 and what hpos to start it at.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3898 Also set `lastpos' to the last position which counts as "on this line"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3899 for cursor-positioning. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3900
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3901 if (pos < ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3902 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3903 if (FETCH_BYTE (pos_byte) == '\n')
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3904 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3905 int opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3906
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3907 /* If stopped due to a newline, start next line after it */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3908 SET_PT_BOTH (pos + 1, pos_byte + 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3909
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3910 val.tab_offset = 0;
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3911 /* 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
3912 at the right margin. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3913 while (PT < ZV && selective > 0
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3914 && indented_beyond_p (PT, PT_BYTE, selective))
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3915 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3916
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3917 pos = PT, pos_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3918 SET_PT_BOTH (opoint, opoint_byte);
6568
c87ae1f14148 (display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents: 6518
diff changeset
3919 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3920 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921 /* Stopped due to right margin of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3922 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923 if (truncate)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3925 int opoint = PT, opoint_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3926
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3927 SET_PT_BOTH (pos, pos_byte);
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3928 *p1++ = fix_glyph (f, truncator, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3929 /* Truncating => start next line after next newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 and point is on this line if it is before the newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3931 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
3932 do
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3933 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3934 while (PT < ZV && selective > 0
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3935 && indented_beyond_p (PT, PT_BYTE, selective));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3936 pos = PT, pos_byte = PT_BYTE;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3937 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3938 SET_PT_BOTH (opoint, opoint_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3939
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3940 lastpos = pos - (FETCH_BYTE (pos_byte - 1) == '\n');
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
3941 lastpos_byte = CHAR_TO_BYTE (lastpos);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3942 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3943 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3944 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3945 {
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
3946 *p1++ = fix_glyph (f, continuer, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3947 val.vpos = 0;
21028
0e9e9906db7b (try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 20997
diff changeset
3948 DEC_BOTH (lastpos, lastpos_byte);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3949 val.tab_offset = taboffset + width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3950 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3952 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3953 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
3954 val.tab_offset = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3955
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 /* 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
3957 record its frame location now. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3958
6705
301d0609754b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6704
diff changeset
3959 if (start <= PT && PT <= lastpos && cursor_vpos < 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3960 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3961 cursor_vpos = vpos;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
3962 cursor_hpos = p1 - leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3963 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3964
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3965 if (cursor_vpos == vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3966 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3967 if (cursor_hpos < 0) cursor_hpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3968 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
3969 cursor_hpos += WINDOW_LEFT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3970 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3971 {
11649
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3972 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
3973 && 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
3974 {
d3a8fb1db72f (display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents: 11641
diff changeset
3975 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
3976 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
3977 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3978
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3979 if (w == XWINDOW (selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3980 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3981 /* Line is not continued and did not start
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3982 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
3983 if ((hpos - WINDOW_LEFT_MARGIN (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3984 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3985 && val.vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3986 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3987 this_line_bufpos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3988 this_line_buffer = current_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3989 this_line_vpos = cursor_vpos;
19120
1ba82399f2b1 (redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents: 19061
diff changeset
3990 this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3991 this_line_endpos = Z - lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3992 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3993 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3994 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3995 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3996 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3997 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3998
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3999 /* If hscroll and line not empty, insert truncation-at-left marker */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4000 if (hscroll && lastpos != start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4001 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4002 GLYPH g = fix_glyph (f, truncator, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4003 *leftmargin = g;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
4004 if (p1 <= leftmargin)
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
4005 p1 = leftmargin + 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4006 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
4007 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4008 p1prev = leftmargin + 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4009 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4010 *p1prev++ = g;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4011 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4012 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4013
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4014 if (!WINDOW_RIGHTMOST_P (w))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4015 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4016 endp++;
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
4017 if (p1 < leftmargin) p1 = leftmargin;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4018 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
4019
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
4020 /* 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
4021 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
4022 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
4023 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
4024 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
4025 {
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
4026 int i;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
4027 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
4028 *p1++ = SPACEGLYPH;
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
4029 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4030 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
4031 *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
4032 ? XINT (DISP_BORDER_GLYPH (dp))
12921
ed1abc9d781b (display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents: 12792
diff changeset
4033 : '|');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4034 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4035 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4036 p1 - desired_glyphs->glyphs[vpos]);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4037 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4038
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4039 /* If the start of this line is the overlay arrow-position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4040 then put the arrow string into the display-line. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4041
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4042 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4043 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4044 && 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
4045 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4046 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4047 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4048 int i, i_byte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4049 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
4050 int arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4051
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4052 if (len > width)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
4053 len = width;
21310
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4054
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4055 /* If the arrow string has text props, obey them when displaying. */
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4056 for (i = 0, i_byte = 0; i < len; )
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
4057 {
21310
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4058 int c;
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4059 Lisp_Object face, ilisp;
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4060 int newface;
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4061 int idx = i;
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4062
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4063 if (STRING_MULTIBYTE (Voverlay_arrow_string))
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4064 FETCH_STRING_CHAR_ADVANCE (c, Voverlay_arrow_string, i, i_byte);
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4065 else
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4066 c = XSTRING (Voverlay_arrow_string)->data[i++];
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4067
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4068 XSETFASTINT (ilisp, i);
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4069 #ifdef HAVE_FACES
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4070 if (FRAME_WINDOW_P (f))
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
4071 {
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
4072 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
4073 newface = compute_glyph_face_1 (f, face, 0);
21310
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4074 c = FAST_MAKE_GLYPH (c, newface);
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
4075 }
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
4076 #endif /* HAVE_FACES */
21310
d5dab6049412 (display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21290
diff changeset
4077 leftmargin[idx] = c;
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
4078 }
3726
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
4079
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
4080 /* 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
4081 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
4082 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
4083 desired_glyphs->used[vpos] = arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4084
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4085 overlay_arrow_seen = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4086 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4087
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4088 val.bufpos = pos;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4089 val.bytepos = pos_byte;
16397
9a25cfded05a (display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents: 16266
diff changeset
4090 val.ovstring_chars_done = ovstr_done;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4091 val_display_text_line = val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4092 return &val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4093 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4094
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4095 /* 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
4096
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4097 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4098 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4099 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4100 {
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4101 Lisp_Object items, tail;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4102 register int vpos = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4103 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
20689
10a3afa36ed2 (display_menu_bar): Don't set maxendcol too large.
Richard M. Stallman <rms@gnu.org>
parents: 20666
diff changeset
4104 int maxendcol = FRAME_WIDTH (f);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4105 int hpos = 0;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4106 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4107
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
4108 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
4109 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
4110 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
4111 #endif
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
4112
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
4113 #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
4114 if (FRAME_X_P (f))
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4115 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
4116 #endif /* USE_X_TOOLKIT */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4117
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4118 get_display_line (f, vpos, 0);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4119
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4120 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
4121 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
4122 {
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4123 Lisp_Object pos, string;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4124 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
4125 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4126 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
4127
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
4128 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4129
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4130 if (hpos < maxendcol)
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4131 hpos = display_string (w, vpos,
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4132 XSTRING (string)->data,
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
4133 STRING_BYTES (XSTRING (string)),
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4134 hpos, 0, 0, hpos, maxendcol,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4135 STRING_MULTIBYTE (string));
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
4136 /* 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
4137 if (hpos < maxendcol)
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
4138 {
11065
da9137aa151f (display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents: 11011
diff changeset
4139 int hpos1 = hpos + 1;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
4140 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
4141 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
4142 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4143 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4144
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4145 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4146 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
4147
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
4148 /* 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
4149 if (maxendcol > hpos)
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4150 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
4151
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
4152 /* 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
4153 vpos++;
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
4154 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
4155 get_display_line (f, vpos++, 0);
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4156 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
4157
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4158 /* Display the mode line for window w */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4159
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4160 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4161 display_mode_line (w)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4162 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4163 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4164 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
4165 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
4166 register int right = WINDOW_RIGHT_MARGIN (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4167 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4168
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4169 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
4170 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4171
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4172 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
4173
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
4174 /* 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
4175 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
4176 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
4177 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
4178
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
4179 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
4180 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
4181
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
4182 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
4183
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4184 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4185
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4186 /* 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
4187 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
4188 partial-width windows and avoid inverting the scroll bar columns. */
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9530
diff changeset
4189 #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
4190 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
4191 {
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
4192 /* 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
4193 int i;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4194 unsigned int padding;
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
4195 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
4196 for (i = left; i < right; ++i)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4197 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4198 padding = ptr[i] & GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4199 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
4200 }
6278
ab5b9470fd85 (display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents: 6134
diff changeset
4201 }
17107
864b6036361c (try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents: 17017
diff changeset
4202 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
4203 #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
4204
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
4205 /* 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
4206 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
4207 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
4208 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
4209 (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
4210 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
4211 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
4212 || 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
4213 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4214 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4215
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4216 /* Contribute ELT to the mode line for window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4217 How it translates into text depends on its data type.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4218
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4219 VPOS is the position of the mode line being displayed.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4220
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4221 HPOS is the position (absolute on frame) where this element's text
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4222 should start. The output is truncated automatically at the right
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4223 edge of window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4224
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4225 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4226 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4227
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4228 MINENDCOL is the hpos before which the element may not end.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4229 The element is padded at the right with spaces if nec
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4230 to reach this column.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4231
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4232 MAXENDCOL is the hpos past which this element may not extend.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4233 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4234 (This is necessary to make nested padding and truncation work.)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4235
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4236 Returns the hpos of the end of the text generated by ELT.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4237 The next element will receive that value as its HPOS arg,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4238 so as to concatenate the elements. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4239
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4240 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4241 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4242 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4243 register int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4244 int depth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4245 int minendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4246 register int maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4247 register Lisp_Object elt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4248 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4249 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4250 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4251 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4252
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4253 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4254
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
4255 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4256 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4257 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4258 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4259 /* A string: output it and check for %-constructs within it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4260 register unsigned char c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4261 register unsigned char *this = XSTRING (elt)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4262
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4263 while (hpos < maxendcol && *this)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4264 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4265 unsigned char *last = this;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4266 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4267 ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4268 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4269 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4270 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
4271 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4272 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
4273 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4274 hpos = display_string (w, vpos, last, -1, hpos, 0, 1,
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4275 hpos, min (lim, maxendcol),
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4276 STRING_MULTIBYTE (elt));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4277 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4278 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4279 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4280 register int minendcol;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4281 register int spec_width = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4282
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4283 /* We can't allow -ve args due to the "%-" construct */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4284 /* Argument specifies minwidth but not maxwidth
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4285 (maxwidth can be specified by
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4286 (<negative-number> . <stuff>) mode-line elements) */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4287
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4288 while ((c = *this++) >= '0' && c <= '9')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4289 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4290 spec_width = spec_width * 10 + (c - '0');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4291 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4292
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4293 minendcol = hpos + spec_width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4294 if (minendcol > maxendcol)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4295 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4296 spec_width = maxendcol - hpos;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4297 minendcol = maxendcol;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4298 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4299
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4300 if (c == 'M')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4301 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4302 spec_width, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4303 Vglobal_mode_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4304 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
4305 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4306 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
4307 maxendcol - hpos);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4308 if (frame_title_ptr)
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4309 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
4310 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4311 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
4312 hpos, 0, 1,
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4313 minendcol, maxendcol, -1);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4314 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4315 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4316 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4317 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4318 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4319
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4320 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4321 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4322 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4323 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4324 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4325 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4326 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4327 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4328 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4329 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4330 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4331 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4332 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
4333 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4334 {
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4335 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4336 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
4337 minendcol, maxendcol);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4338 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4339 hpos = display_string (w, vpos, XSTRING (tem)->data,
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
4340 STRING_BYTES (XSTRING (tem)),
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4341 hpos, 0, 1, minendcol, maxendcol,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4342 STRING_MULTIBYTE (tem));
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4343 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4344 /* Give up right away for nil or t. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4345 else if (!EQ (tem, elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4346 { elt = tem; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4347 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4348 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4349 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4350
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4351 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4352 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4353 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4354
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4355 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4356 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4357 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4358 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4359 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4360 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4361 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4362 according to whether the symbol's value is non-nil or nil. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4363 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
4364 if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4365 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4366 tem = Fboundp (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4367 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
4368 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4369 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4370 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4371 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4372 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4373 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4374 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4375 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4376 { elt = XCONS (elt)->car; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4377 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4378 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4379 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4380 and if possible find the caddr and use that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4381 elt = XCONS (elt)->cdr;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4382 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4383 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4384 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4385 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4386 elt = XCONS (elt)->car;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4387 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4388 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4389 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4390 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4391 register int lim = XINT (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4392 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4393 if (lim < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4394 /* Negative int means reduce maximum width.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4395 DO NOT change MINENDCOL here!
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4396 (20 -10 . foo) should truncate foo to 10 col
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4397 and then pad to 20. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4398 maxendcol = min (maxendcol, hpos - lim);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4399 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4400 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4401 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4402 current maximum. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4403 lim += hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4404 if (lim > maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4405 lim = maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4406 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4407 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4408 that is beyond the current truncation point. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4409 if (lim > minendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4410 minendcol = lim;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4411 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4412 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4413 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4414 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4415 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4416 register int limit = 50;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4417 /* 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
4418 while (CONSP (elt) && --limit > 0
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4419 && hpos < maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4420 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4421 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4422 hpos, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4423 XCONS (elt)->car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4424 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4425 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4426 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4427 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4428 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4429
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4430 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4431 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4432 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4433 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
4434 else
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4435 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
4436 minendcol, maxendcol, 0);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4437 return hpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4438 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4439
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4440 if (minendcol > hpos)
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4441 if (frame_title_ptr)
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4442 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
4443 else
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4444 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
4445 0, 1, minendcol, maxendcol, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4446 return hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4447 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4448
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4449 /* 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
4450 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
4451
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4452 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4453 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4454 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4455 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4456 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4457 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4458 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4459
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4460 if (d <= 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4461 *p++ = '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4462 else
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4463 while (d > 0)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4464 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4465 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4466 d /= 10;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4467 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4468 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
4469 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4470 while (p > buf)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4471 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4472 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4473 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4474 *p-- = d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4475 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4476 }
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4477
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4478 /* 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
4479 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
4480 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
4481
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4482 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4483 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
4484 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4485 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4486 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4487 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4488 Lisp_Object val;
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4489 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
4490
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4491 val = coding_system;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4492
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4493 if (NILP (val)) /* Not yet decided. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4494 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4495 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4496 *buf++ = '-';
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
4497 if (eol_flag)
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
4498 *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
4499 /* 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
4500 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4501 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4502 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4503 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4504
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4505 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
4506
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4507 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
4508 {
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4509 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
4510 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
4511 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
4512 }
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4513
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4514 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4515 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
4516
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4517 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4518 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4519 /* 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
4520 int eoltype;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4521 /* 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
4522
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4523 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
4524 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
4525 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
4526 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
4527 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
4528 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
4529 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4530 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4531 ? 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
4532
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
4533 /* 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
4534 *buf++ = eoltype;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4535 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4536 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4537 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4538 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4539
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4540 /* 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
4541 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
4542 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
4543 function will later be truncated to width MAXWIDTH. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4544
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
4545 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
4546
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4547 static char *
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4548 decode_mode_spec (w, c, spec_width, maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4549 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4550 register char c;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4551 register int spec_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4552 register int maxwidth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4553 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4554 Lisp_Object obj;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4555 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4556 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
4557 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4558
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
4559 obj = Qnil;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4560 if (maxwidth > FRAME_WIDTH (f))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
4561 maxwidth = FRAME_WIDTH (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4562
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4563 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4564 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4565 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4566 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
4567 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4568 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
4569 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4570 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4571
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4572 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4573 /* 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
4574 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
4575 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4576 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
4577 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4578 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4579
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4580 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4581 /* 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
4582 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
4583 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4584 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4585
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4586 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4587 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4588
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4589 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4590 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4591 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4592 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4593
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4594 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
4595 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4596 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
4597 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
4598 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4599 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4600 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
4601 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4602
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4603 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4604 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4605 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4606 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4607
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4608 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
4609 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4610 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
4611 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
4612 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4613 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4614 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
4615 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4616
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4617 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4618 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4619 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
4620 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
4621
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4622 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
4623 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
4624 else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4625 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4626 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
4627 *p++ = '-';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4628 *p = '\0';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4629 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4630 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
4631 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4632
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4633 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4634 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4635 #if 0
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
4636 if (maxwidth >= 3 && STRING_BYTES (XSTRING (obj)) > maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4637 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4638 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4639 decode_mode_spec_buf[maxwidth - 1] = '\\';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4640 decode_mode_spec_buf[maxwidth] = '\0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4641 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4642 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4643 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4644 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4645
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4646 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4647 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4648 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
4649 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
4650 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
4651 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
4652 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4653
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4654 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4655 /* %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
4656 /* 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
4657 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
4658 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
4659 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
4660 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
4661 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
4662 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
4663 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
4664
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4665 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4666 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4667 #if 0
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
4668 if (NILP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4669 return "[none]";
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
4670 else if (STRINGP (obj) && STRING_BYTES (XSTRING (obj)) > maxwidth)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4671 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4672 bcopy ("...", decode_mode_spec_buf, 3);
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 21179
diff changeset
4673 bcopy (XSTRING (obj)->data + STRING_BYTES (XSTRING (obj)) - maxwidth + 3,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4674 decode_mode_spec_buf + 3, maxwidth - 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4675 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4676 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4677 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4678 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4679
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4680 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4681 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4682 int startpos = XMARKER (w->start)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4683 int startpos_byte = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4684 int line, linepos, linepos_byte, topline;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4685 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4686 Lisp_Object tem;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4687 int height = XFASTINT (w->height);
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 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
4690 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4691 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
4692 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
4693 /* 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
4694 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
4695 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4696
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4697 /* 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
4698 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
4699 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4700 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4701 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4702 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4703 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4704
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4705 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4706 && !NILP (w->base_line_pos)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4707 && XFASTINT (w->base_line_pos) <= startpos)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4708 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4709 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4710 linepos = XFASTINT (w->base_line_pos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4711 linepos_byte = buf_charpos_to_bytepos (b, linepos);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4712 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4713 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4714 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4715 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4716 linepos = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4717 linepos_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4718 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4719
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4720 /* Count lines from base line to window start position. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4721 nlines = display_count_lines (linepos, linepos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4722 startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4723 startpos, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4724
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4725 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4726
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4727 /* 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
4728 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
4729 "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
4730 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
4731 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4732 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4733 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
4734 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
4735 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4736 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
4737 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4738 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4739 int limit = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4740 int limit_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4741 int position;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4742 int distance = (height * 2 + 30) * 200;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4743
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4744 if (startpos - distance > limit)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4745 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4746 limit = startpos - distance;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4747 limit_byte = CHAR_TO_BYTE (limit);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4748 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4749
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4750 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4751 limit_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4752 - (height * 2 + 30),
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4753 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4754 /* 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
4755 200 chars per line,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4756 give up on line numbers for this window. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4757 if (position == limit_byte && limit == startpos - distance)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4758 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4759 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4760 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4761 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4762 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4763
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
4764 XSETFASTINT (w->base_line_number, topline - nlines);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4765 XSETFASTINT (w->base_line_pos, BYTE_TO_CHAR (position));
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4766 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4767
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4768 /* Now count lines from the start pos to point. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4769 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4770 PT_BYTE, PT, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4771
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4772 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4773 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4774
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4775 /* Make the string to show. */
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4776 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
4777 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4778 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4779 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4780 char* p = decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4781 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
4782 strcpy (p, "??");
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4783 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
4784 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4785 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4786 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
4787
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4788 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4789 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4790 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4791
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4792 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4793 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
4794 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4795 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4796
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4797 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4798 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4799 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
4800 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
4801
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4802 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4803 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4804 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4805 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4806 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4807 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4808 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4809 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4810 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4811 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4812 {
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
4813 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
4814 /* 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
4815 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
4816 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
4817 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4818 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4819 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4820 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4821 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4822 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4823 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4824 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4825 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4826
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4827 /* 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
4828 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4829 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4830 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
4831 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
4832 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
4833
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4834 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4835 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4836 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4837 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4838 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4839 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4840 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4841 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4842 {
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
4843 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
4844 /* 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
4845 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
4846 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
4847 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
4848 /* 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
4849 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
4850 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4851 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4852 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4853 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4854 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4855 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4856 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4857 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4858 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
4859
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4860 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4861 /* 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
4862 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
4863 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
4864 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
4865 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4866 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
4867 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4868 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4869
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4870 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
4871 #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
4872 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
4873 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4874 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
4875 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4876
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4877 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4878 /* 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
4879 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4880 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4881 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4882 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
4883 char *p = decode_mode_spec_buf;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4884
19562
318a3a6a8ff5 (decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents: 19478
diff changeset
4885 if (! FRAME_WINDOW_P (f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4886 {
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4887 /* 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
4888 to do EOL conversion. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4889 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
4890 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
4891 }
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
4892 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
4893 p, eol_flag);
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
4894
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4895 #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
4896 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4897 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4898 if (PROCESSP (obj))
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 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
4901 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4902 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
4903 p, eol_flag);
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 #endif /* subprocesses */
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
4906 #endif /* 0 */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4907 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4908 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
4909 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4910 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
4911
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
4912 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4913 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4914 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4915 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4916 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4917
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4918 /* Count up to COUNT lines starting from START / START_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4919 But don't go beyond LIMIT_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4920 Return the number of lines thus found (always nonnegative).
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4921
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4922 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4923
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4924 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4925 display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4926 int start, start_byte, limit_byte, count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4927 int *byte_pos_ptr;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4928 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4929 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4930 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4931
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4932 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4933 register unsigned char *ceiling_addr;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4934 int orig_count = count;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4935
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4936 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4937 check only for newlines. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4938 int selective_display = (!NILP (current_buffer->selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4939 && !INTEGERP (current_buffer->selective_display));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4940
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4941 if (count > 0)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4942 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4943 while (start_byte < limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4944 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4945 ceiling = BUFFER_CEILING_OF (start_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4946 ceiling = min (limit_byte - 1, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4947 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4948 base = (cursor = BYTE_POS_ADDR (start_byte));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4949 while (1)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4950 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4951 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4952 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4953 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4954 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4955 while (*cursor != '\n' && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4956 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4957
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4958 if (cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4959 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4960 if (--count == 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4961 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4962 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4963 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4964 return orig_count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4965 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4966 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4967 if (++cursor == ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4968 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4969 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4970 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4971 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4972 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4973 start_byte += cursor - base;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4974 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4975 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4976 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4977 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4978 while (start_byte > limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4979 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4980 ceiling = BUFFER_FLOOR_OF (start_byte - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4981 ceiling = max (limit_byte, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4982 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4983 base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1);
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4984 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4985 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4986 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4987 while (--cursor != ceiling_addr
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4988 && *cursor != '\n' && *cursor != 015)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4989 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4990 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4991 while (--cursor != ceiling_addr && *cursor != '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4992 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4993
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4994 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4995 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4996 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
4997 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4998 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4999 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5000 /* When scanning backwards, we should
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5001 not count the newline posterior to which we stop. */
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5002 return - orig_count - 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5003 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5004 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5005 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5006 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5007 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5008 /* Here we add 1 to compensate for the last decrement
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5009 of CURSOR, which took it past the valid range. */
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5010 start_byte += cursor - base + 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5011 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5012 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5013
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5014 *byte_pos_ptr = limit_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5015
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5016 if (count < 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5017 return - orig_count + count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5018 return orig_count - count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5019
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
5020 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5021
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5022 /* Display STRING on one line of window W, starting at HPOS.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5023 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
5024 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
5025 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
5026
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5027 TRUNCATE is GLYPH to display at end if truncated. Zero for none.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5028
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5029 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
5030 MAXCOL is the last column ok to end at. Truncate here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5031 -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
5032 Both count from the left edge of the frame, as does HPOS.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5033 The right edge of W is an implicit maximum.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5034 If TRUNCATE is nonzero, the implicit maximum is one column before the edge.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5035
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5036 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
5037 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
5038 and not display anything beyond there. Otherwise, only MAXCOL
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5039 controls where to stop output.
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5040
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5041 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
5042 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
5043 value of enable_multibyte_characters.
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5044
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5045 Returns ending hpos. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5046
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5047 static int
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5048 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
5049 obey_window_width, mincol, maxcol, multibyte)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5050 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5051 unsigned char *string;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5052 int length;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5053 int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5054 GLYPH truncate;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5055 int obey_window_width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5056 int mincol, maxcol;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5057 int multibyte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5058 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5059 register int c;
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5060 int truncated;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5061 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5062 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
5063 int tab_width = XINT (XBUFFER (w->buffer)->tab_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5064 register GLYPH *start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5065 register GLYPH *end;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
5066 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
5067 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5068 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5069 int window_width = XFASTINT (w->width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5070
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5071 /* Use the standard display table, not the window's display table.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5072 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
5073 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
5074 int i;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5075
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5076 if (multibyte == -1)
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5077 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
5078 /* 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
5079
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
5080 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
5081 dp = XCHAR_TABLE (Vstandard_display_table);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5082
2324
24cd3df6f184 (display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents: 2303
diff changeset
5083 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5084
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5085 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
5086 start = desired_glyphs->glyphs[vpos];
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5087
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5088 if (obey_window_width)
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
5089 {
18852
ab7fae992236 (display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents: 18834
diff changeset
5090 start += XFASTINT (w->left);
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5091 end = start + window_width - (truncate != 0);
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5092
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
5093 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
5094 {
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
5095 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
5096 {
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5097 int i;
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5098
8943
a9e40d478857 (display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents: 8919
diff changeset
5099 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
5100 *end-- = ' ';
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5101 }
16255
dcde843403a3 (display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents: 16245
diff changeset
5102 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f))
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5103 *end-- = '|';
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
5104 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
5105 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5106
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5107 if (! obey_window_width
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5108 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5109 end = desired_glyphs->glyphs[vpos] + maxcol;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5110
6612
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
5111 /* 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
5112 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
5113 desired_glyphs->charstarts[vpos][i] = 0;
1462bf31ef3c (redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6568
diff changeset
5114
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5115 if (maxcol >= 0 && mincol > maxcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5116 mincol = maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5117
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5118 if (length < 0)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5119 /* We need this value for multibyte characters. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5120 length = strlen (string);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5121
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5122 /* 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
5123 (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
5124 truncated = 0;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5125 while (1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5126 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5127 int len;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5128
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5129 if (length <= 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5130 break;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5131 if (multibyte)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5132 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
5133 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5134 c = *string, len = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5135
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5136 string += len, length -= len;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5137
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5138 if (p1 >= end)
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5139 {
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5140 truncated = 1;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5141 break;
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5142 }
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5143
10822
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5144 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
5145 {
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5146 p1 = copy_part_of_rope (f, p1, start,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5147 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5148 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size,
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5149 0);
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5150 }
1ec15b8745a2 (display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 10769
diff changeset
5151 else if (c >= 040 && c < 0177)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5152 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5153 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5154 *p1 = c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5155 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5156 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5157 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5158 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5159 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5160 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5161 if (p1 >= start && p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5162 *p1 = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5163 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5164 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5165 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5166 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
5167 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5168 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5169 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
5170 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
5171 (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
5172 && 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
5173 ? 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
5174 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5175 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
5176 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5177 *p1 = c ^ 0100;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5178 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5179 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5180 else if (len == 1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5181 {
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5182 /* C is a control character or a binary byte data. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5183 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
5184 *p1 = (fix_glyph
9468df9944cc (copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents: 17107
diff changeset
5185 (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
5186 && 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
5187 ? 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
5188 0));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5189 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
5190 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5191 *p1 = (c >> 6) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5192 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
5193 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5194 *p1 = (7 & (c >> 3)) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5195 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
5196 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5197 *p1 = (7 & c) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5198 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5199 }
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5200 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5201 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5202 /* C is a multibyte character. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5203 int charset = CHAR_CHARSET (c);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5204 int columns = (charset == CHARSET_COMPOSITION
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5205 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5206 : CHARSET_WIDTH (charset));
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5207
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5208 if (p1 < start)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5209 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5210 /* 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
5211 columns with spaces. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5212 columns -= start - p1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5213 p1 = start;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5214 while (columns--)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5215 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5216 if (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5217 *p1 = SPACEGLYPH;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5218 p1++;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5219 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5220 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5221 else if (p1 + columns > end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5222 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5223 /* 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
5224 columns with TRUNCATE if TRUNCATE is specified. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5225 if (truncate)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5226 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5227 while (p1 < end)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5228 *p1++ = fix_glyph (f, truncate, 0);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5229 /* And tell the line is truncated. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5230 truncated = 1;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5231 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5232 break;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5233 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5234 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5235 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5236 /* 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
5237 *p1++ = c;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5238 while (--columns)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5239 *p1++ = c | GLYPH_MASK_PADDING;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5240 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5241 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5242 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5243
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
5244 if (truncated)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5245 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5246 p1 = end;
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
5247 if (truncate) *p1++ = fix_glyph (f, truncate, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5248 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5249 else if (mincol >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5250 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5251 end = desired_glyphs->glyphs[vpos] + mincol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5252 while (p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5253 *p1++ = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5254 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5255
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5256 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5257 register int len = p1 - desired_glyphs->glyphs[vpos];
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5258
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5259 if (len > desired_glyphs->used[vpos])
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5260 desired_glyphs->used[vpos] = len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5261 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5262
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5263 return len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5264 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5265 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5266
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5267 /* 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
5268 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
5269 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
5270 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
5271 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
5272 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5273 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5274
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5275 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5276 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5277 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5278 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5279 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5280 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5281 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
5282 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5283 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5284 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5285 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5286 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5287 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
5288 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5289 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5290 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5291 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5292 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5293 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5294 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5295 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5296 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
5297 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5298 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5299 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5300 if (EQ (propelt, tem))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5301 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5302 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
5303 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5304 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5305 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5306 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5307 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5308
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5309 /* 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
5310 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
5311 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
5312 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
5313 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
5314 Otherwise return 0.
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5315 This function cannot quit. */
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5316
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5317 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5318 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5319 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5320 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5321 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5322 register Lisp_Object tail, proptail;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5323 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
5324 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5325 register Lisp_Object tem;
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5326 tem = XCONS (tail)->car;
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5327 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
5328 return ! NILP (XCONS (tem)->cdr);
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5329 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5330 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5331 for (proptail = propval; CONSP (proptail);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5332 proptail = XCONS (proptail)->cdr)
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5333 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5334 Lisp_Object propelt;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5335 propelt = XCONS (proptail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5336 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
5337 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5338 register Lisp_Object tem;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5339 tem = XCONS (tail)->car;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5340 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
5341 return ! NILP (XCONS (tem)->cdr);
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5342 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
5343 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5344 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5345 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
5346
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5347 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5348 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5349 {
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
5350 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
5351 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
5352
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
5353 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
5354 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
5355
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
5356 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
5357 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
5358
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5359 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5360 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
5361
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
5362 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
5363 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
5364
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5365 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5366 staticpro (&last_arrow_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367 last_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368 last_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5369
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5370 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
5371 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5372 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5373
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5374 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5375 "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
5376 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5377 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5378 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5379
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5380 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5381 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5382 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5383
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5384 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5385 "*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
5386 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
5387 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
5388
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5389 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5390 "*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
5391 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
5392
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5393 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5394 "*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
5395 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
5396 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5397 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
5398
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5399 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5400
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5401 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5402 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5403 "*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
5404 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5405
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5406 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5407 "*Non-nil means use inverse video for the mode line.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5408 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
5409
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
5410 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit,
20997
115d8c173aaf (syms_of_xdisp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 20981
diff changeset
5411 "*Maximum buffer size (in characters) for line number display\n\
115d8c173aaf (syms_of_xdisp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 20981
diff changeset
5412 If the buffer is bigger than this, the line number does not appear\n\
115d8c173aaf (syms_of_xdisp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 20981
diff changeset
5413 in the mode line..");
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
5414 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
5415
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
5416 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
5417 "*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
5418 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
5419
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5420 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
5421 "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
5422 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
5423 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
5424 `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
5425
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5426 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
5427 "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
5428 \(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
5429 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
5430 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
5431 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5432 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
5433 "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
5434 \(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
5435 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
5436 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
5437 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5438 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5439 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5440 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5441 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5442 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5443 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5444 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5445 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5446 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5447 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5448
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5449 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5450 "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
5451 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
5452 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5453 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
5454
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
5455 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
5456 "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
5457 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
5458 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
5459 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
5460 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
5461 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
5462
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
5463 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
20259
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5464 "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
5465 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
5466 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
5467 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
5468 Vwindow_scroll_functions = Qnil;
20259
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5469
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5470 DEFVAR_INT ("minibuffer-scroll-overlap", &minibuffer_scroll_overlap,
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5471 "*Number of characters of overlap when scrolling a one-line window.\n\
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5472 This commonly affects the minibuffer window, hence the name of the variable.");
0393daff516c (minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20258
diff changeset
5473 minibuffer_scroll_overlap = 20;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5474 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5475
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5476 /* initialize the window system */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
5477 void
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5478 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5479 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5480 Lisp_Object root_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5481 #ifndef COMPILER_REGISTER_BUG
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5482 register
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5483 #endif /* COMPILER_REGISTER_BUG */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5484 struct window *mini_w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5485
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5486 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5487
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5488 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
5489 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5490
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5491 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5492 previous_echo_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5493
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5494 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5495 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5496 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
5497 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
5498 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
5499 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
5500 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5501 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5502 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5503
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
5504 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
5505 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5506 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5507 }