annotate src/xdisp.c @ 5750:e1153522d5f1

(mouse-sel-version): Don't base version number on RCS revision. Updated to version 2.0. (mouse-sel-set-selection-function, mouse-sel-get-selection-function, mouse-sel-check-selection-function): Check whether X11 functions are bound when setting defaults. (mouse-extend): Check whether modify-frame-parameters is bound before calling it. Add support to kill region with double-mouse-3.
author Richard M. Stallman <rms@gnu.org>
date Wed, 02 Feb 1994 23:19:11 +0000
parents 0709eb474647
children 295e342614a4
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.
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94 Free Software Foundation, Inc.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4 This file is part of GNU Emacs.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 any later version.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU General Public License for more details.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 along with GNU Emacs; see the file COPYING. If not, write to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4423
diff changeset
21 #include <config.h>
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 #include <stdio.h>
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 /*#include <ctype.h>*/
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #undef NULL
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include "lisp.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
26 #include "frame.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "window.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "termchar.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "dispextern.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "buffer.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "indent.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "commands.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "macros.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #include "disptab.h"
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
35 #include "termhooks.h"
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
36 #include "intervals.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
38 #ifdef USE_X_TOOLKIT
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
39 extern void set_frame_menubar ();
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
40 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
41
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 /* Nonzero means print newline before next minibuffer message. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 #define min(a, b) ((a) < (b) ? (a) : (b))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 #define max(a, b) ((a) > (b) ? (a) : (b))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 /* The buffer position of the first character appearing
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
53 entirely or partially on the current frame line.
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
54 Or zero, which disables the optimization for the current frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 static int this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 /* Number of characters past the end of this line,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 including the terminating newline */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59 static int this_line_endpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
61 /* The vertical position of this frame line. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
62 static int this_line_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
64 /* Hpos value for start of display on this frame line.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 Usually zero, but negative if first character really began
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66 on previous line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
67 static int this_line_start_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
69 /* Buffer that this_line variables are describing. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 /* Set by try_window_id to the vpos of first of any lines
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
73 scrolled on to the bottom of the frame. These lines should
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74 not be included in any general scroll computation. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75 static int scroll_bottom_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
77 /* 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
78 If this is nonzero, there is a message on the frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
79 in the minibuffer and it should be erased as soon
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80 as it is no longer requested to appear. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 char *previous_echo_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
83 /* Nonzero means truncate lines in all windows less wide than the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
84 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 /* Marker for where to display an arrow on top of the buffer text. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 /* String to display for the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 /* Values of those variables at last redisplay. */
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
95 static Lisp_Object last_arrow_position, last_arrow_string;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 /* Nonzero if overlay arrow has been displayed once in this window. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
100 /* 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
101 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
102
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
103 /* If cursor motion alone moves point off frame,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 Try scrolling this many lines up or down if that will bring it back. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 int scroll_step;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 /* Nonzero if try_window_id has made blank lines at window bottom
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 since the last redisplay that paused */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 static int blank_end_of_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 /* Number of windows showing the buffer of the selected window.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 keyboard.c refers to this. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
115 /* 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
116 whether the window is selected or not.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 Set one to -1 first to determine whether point was found afterwards. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 static int cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120 static int cursor_hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 int debug_end_pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
123
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 /* Nonzero means display mode line highlighted */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 static void echo_area_display ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 void mark_window_display_accurate ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 static void redisplay_windows ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 static void redisplay_window ();
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
131 static void update_menu_bars ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
132 static void update_menu_bar ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 static void try_window ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134 static int try_window_id ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 static struct position *display_text_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 static void display_mode_line ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 static int display_mode_element ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 static char *fmodetrunc ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
139 static char *decode_mode_spec ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 static int display_string ();
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
141 static void display_menu_bar ();
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
142 static int display_count_lines ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 /* Prompt to display in front of the minibuffer contents */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 char *minibuf_prompt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 /* Width in columns of current minibuffer prompt. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 int minibuf_prompt_width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 /* Message to display instead of minibuffer contents
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151 This is what the functions error and message make,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 and command echoing uses it as well.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 It overrides the minibuf_prompt as well as the buffer. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 char *echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
156 /* 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
157 int echo_area_glyphs_length;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
158
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 /* true iff we should redraw the mode lines on the next redisplay */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162 /* Smallest number of characters before the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
163 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 int beg_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 /* Smallest number of characters after the gap
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 at any time since last redisplay that finished.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 Valid for current buffer when try_window_id can be called. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 int end_unchanged;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 /* MODIFF as of last redisplay that finished;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 if it matches MODIFF, beg_unchanged and end_unchanged
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 contain no useful information */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 int unchanged_modified;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 /* Nonzero if head_clip or tail_clip of current buffer has changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 since last redisplay that finished */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 int clip_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 /* Nonzero if window sizes or contents have changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 since last redisplay that finished */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
185 /* 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
186 and it displayed a line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
187 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
188
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
189 /* Maximum buffer size for which to display line numbers. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
190 int line_number_display_limit;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
192 /* Specify m, a string, as a message in the minibuf. If m is 0, clear out
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
193 any existing message, and let the minibuffer text show through. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
194
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
195 void
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
196 message1 (m)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
197 char *m;
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
198 {
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
199 if (noninteractive)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
200 {
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
201 if (noninteractive_need_newline)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
202 putc ('\n', stderr);
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
203 noninteractive_need_newline = 0;
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
204 if (cursor_in_echo_area != 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
205 fprintf (stderr, "%s", m);
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
206 else
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
207 fprintf (stderr, "%s\n", m);
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
208 fflush (stderr);
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
209 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
210 /* A null message buffer means that the frame hasn't really been
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
211 initialized yet. Error messages get reported properly by
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
212 cmd_error, so this must be just an informative message; toss it. */
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
213 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
214 {
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
215 #ifdef MULTI_FRAME
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
216 Lisp_Object minibuf_frame;
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
217
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
218 choose_minibuf_frame ();
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
219 minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
220 FRAME_SAMPLE_VISIBILITY (XFRAME (minibuf_frame));
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
221 if (FRAME_VISIBLE_P (selected_frame)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
222 && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame)))
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
223 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window)));
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
224 #endif
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
225
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
226 if (m)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
227 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
228 echo_area_glyphs = m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
229 echo_area_glyphs_length = strlen (m);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
230 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
231 else
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
232 echo_area_glyphs = previous_echo_glyphs = 0;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
233
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
234 do_pending_window_change ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
235 echo_area_display ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
236 update_frame (XFRAME (XWINDOW (minibuf_window)->frame), 1, 1);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
237 do_pending_window_change ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
238 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
239 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
240
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
241 /* Display an echo area message M with a specified length of LEN chars.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
242 This way, null characters can be included. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
243
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
244 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
245 message2 (m, len)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
246 char *m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
247 int len;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
248 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
249 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
250 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
251 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
252 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
253 noninteractive_need_newline = 0;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
254 fwrite (m, len, 1, stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
255 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
256 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
257 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
258 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
259 /* 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
260 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
261 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
262 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
263 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
264 #ifdef MULTI_FRAME
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
265 Lisp_Object minibuf_frame;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
266
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
267 choose_minibuf_frame ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
268 minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
269 FRAME_SAMPLE_VISIBILITY (XFRAME (minibuf_frame));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
270 if (FRAME_VISIBLE_P (selected_frame)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
271 && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame)))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
272 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window)));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
273 #endif
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
274
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
275 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
276 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
277 echo_area_glyphs = m;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
278 echo_area_glyphs_length = len;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
279 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
280 else
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
281 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
282
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
283 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
284 echo_area_display ();
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
285 update_frame (XFRAME (XWINDOW (minibuf_window)->frame), 1, 1);
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
286 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
287 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
288 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
289
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
290 /* 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
291 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
292
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
293 void
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
294 truncate_echo_area (len)
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
295 int len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
296 {
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
297 /* 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
298 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
299 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
300 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
301 echo_area_glyphs_length = len;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
302 }
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
303
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
304 /* 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
305 zero if being used by message. */
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
306 int message_buf_print;
c1f8ba0ea512 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 301
diff changeset
307
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
308 /* Dump an informative message to the minibuf. If m is 0, clear out
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
309 any existing message, and let the minibuffer text show through. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
310 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 char *m;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
315 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
317 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
318 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
319 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
320 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
321 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
322 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
323 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
324 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
325 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
326 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
328 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 {
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
330 /* 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
331 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
332 to use its buffer, not the selected frame's buffer. */
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
333 FRAME_PTR echo_frame;
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
334 #ifdef MULTI_FRAME
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
335 choose_minibuf_frame ();
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
336 echo_frame = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)));
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
337 #else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
338 echo_frame = selected_frame;
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
339 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
341 /* 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
342 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
343 cmd_error, so this must be just an informative message; toss it. */
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
344 if (FRAME_MESSAGE_BUF (echo_frame))
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
345 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
346 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
347 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
348 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
349 #ifdef NO_ARG_ARRAY
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
350 int a[3];
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
351 a[0] = a1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
352 a[1] = a2;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
353 a[2] = a3;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
354
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
355 len = doprnt (FRAME_MESSAGE_BUF (echo_frame),
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
356 FRAME_WIDTH (echo_frame), m, 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
357 #else
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
358 len = doprnt (FRAME_MESSAGE_BUF (echo_frame),
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
359 FRAME_WIDTH (echo_frame), m, 0, 3, &a1);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
360 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
361
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
362 message2 (FRAME_MESSAGE_BUF (echo_frame), len);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
363 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
364 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
365 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
366
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
367 /* 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
368 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
369 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
370 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375 echo_area_display ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 register int vpos;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
378 FRAME_PTR f;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
380 #ifdef MULTI_FRAME
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
381 choose_minibuf_frame ();
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
382 #endif
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
383
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
384 f = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
386 if (! FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
389 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
391 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
392 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 if (echo_area_glyphs || minibuf_level == 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 vpos = XFASTINT (XWINDOW (minibuf_window)->top);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
398 get_display_line (f, vpos, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 display_string (XWINDOW (minibuf_window), vpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 echo_area_glyphs ? echo_area_glyphs : "",
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
401 echo_area_glyphs ? echo_area_glyphs_length : -1,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
402 0, 0, 0, FRAME_WIDTH (f));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 /* If desired cursor location is on this line, put it at end of text */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
405 if (FRAME_CURSOR_Y (f) == vpos)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
406 FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos];
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
407
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
408 /* Fill the rest of the minibuffer window with blank lines. */
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
409 {
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
410 int i;
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
411
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
412 for (i = vpos + 1;
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
413 i < vpos + XFASTINT (XWINDOW (minibuf_window)->height); i++)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
414 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
415 get_display_line (f, i, 0);
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
416 display_string (XWINDOW (minibuf_window), vpos,
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
417 "", 0, 0, 0, 0, FRAME_WIDTH (f));
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
418 }
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 588
diff changeset
419 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
420 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
421 else if (!EQ (minibuf_window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422 windows_or_buffers_changed++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424 if (EQ (minibuf_window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 previous_echo_glyphs = echo_area_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
428 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
430 /* Prepare for redisplay by updating menu-bar item lists when appropriate.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
431 This can't be done in `redisplay' itself because it can call eval. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
432
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
433 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
434 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
435 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
436 register struct window *w = XWINDOW (selected_window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
437 int all_windows;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
438
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
439 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
440 return;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
441
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
442 /* Set the visible flags for all frames.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
443 Do this before checking for resized or garbaged frames; they want
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
444 to know if their frames are visible.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
445 See the comment in frame.h for FRAME_SAMPLE_VISIBILITY. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
446 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
447 Lisp_Object tail, frame;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
448
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
449 FOR_EACH_FRAME (tail, frame)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
450 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
451 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
452
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
453 /* Notice any pending interrupt request to change frame size. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
454 do_pending_window_change ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
455
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
456 if (frame_garbaged)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
457 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
458 redraw_garbaged_frames ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
459 frame_garbaged = 0;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
460 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
461
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
462 if (clip_changed || windows_or_buffers_changed)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
463 update_mode_lines++;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
464
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
465 /* Detect case that we need to write a star in the mode line. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
466 if (XFASTINT (w->last_modified) < MODIFF
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
467 && XFASTINT (w->last_modified) <= current_buffer->save_modified)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
468 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
469 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
470 if (buffer_shared > 1)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
471 update_mode_lines++;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
472 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
473
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
474 all_windows = update_mode_lines || buffer_shared > 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
475
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
476 /* If specs for an arrow have changed, do thorough redisplay
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
477 to ensure we remove any arrow that should no longer exist. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
478 if (! EQ (Voverlay_arrow_position, last_arrow_position)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
479 || ! EQ (Voverlay_arrow_string, last_arrow_string))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
480 all_windows = 1, clip_changed = 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
481
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
482 /* Update the menu bar item lists, if appropriate.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
483 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
484 or generation of display lines. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
485 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
486 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
487 Lisp_Object tail, frame;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
488
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
489 FOR_EACH_FRAME (tail, frame)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
490 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
491 FRAME_PTR f = XFRAME (frame);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
492
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
493 if (FRAME_VISIBLE_P (f))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
494 update_menu_bars (FRAME_ROOT_WINDOW (f));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
495 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
496 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
497 else if (FRAME_VISIBLE_P (selected_frame))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
498 update_menu_bar (selected_window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
499 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
500
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
501 /* Do a frame update, taking possible shortcuts into account.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 This is the main external entry point for redisplay.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
503
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 If the last redisplay displayed an echo area message and that
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 message is no longer requested, we clear the echo area
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 or bring back the minibuffer if that is in use.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
508 Do not call eval from within this function.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
509 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
510 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
511 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
512 but can still lose, because this function
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
513 can be called from signal handlers; with alarms set up;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 or with synchronous processes running.
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
515
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
516 See Fcall_process; if you called it from here, it could be
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
517 entered recursively. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
518
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
519 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520 redisplay ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
521 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 register struct window *w = XWINDOW (selected_window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524 int must_finish = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 int all_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526 register int tlbufpos, tlendpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 struct position pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528 extern int input_pending;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
529
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
530 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
531 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
532
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
533 /* 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
534 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
535 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
536 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
537 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
538 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
539
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
540 FOR_EACH_FRAME (tail, frame)
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
541 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
542 }
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
543
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
544 /* Notice any pending interrupt request to change frame size. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
547 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548 {
3516
f1ca34ddfd84 (redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents: 3266
diff changeset
549 redraw_garbaged_frames ();
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
550 frame_garbaged = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 if (clip_changed || windows_or_buffers_changed)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 /* Detect case that we need to write a star in the mode line. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 if (XFASTINT (w->last_modified) < MODIFF
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 && XFASTINT (w->last_modified) <= current_buffer->save_modified)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561 if (buffer_shared > 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 update_mode_lines++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
563 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
564
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
565 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567 all_windows = update_mode_lines || buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
568
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 /* If specs for an arrow have changed, do thorough redisplay
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 to ensure we remove any arrow that should no longer exist. */
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
571 if (! EQ (Voverlay_arrow_position, last_arrow_position)
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
572 || ! EQ (Voverlay_arrow_string, last_arrow_string))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 all_windows = 1, clip_changed = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
574
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
575 /* 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
576 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
577 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
578 again here. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
579 if (echo_area_glyphs || previous_echo_glyphs)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
580 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
581 echo_area_display ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
582 must_finish = 1;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
583 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
584
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
585 /* 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
586 if (((!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
587 && !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
588 != !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
589 || (!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
590 && !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
591 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
592 this_line_bufpos = -1;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
593
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 tlbufpos = this_line_bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595 tlendpos = this_line_endpos;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
596 if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
597 && FRAME_VISIBLE_P (XFRAME (w->frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 /* Make sure recorded data applies to current buffer, etc */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599 && this_line_buffer == current_buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
600 && current_buffer == XBUFFER (w->buffer)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
601 && NILP (w->force_start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
602 /* Point must be on the line that we have info recorded about */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
603 && point >= tlbufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
604 && point <= Z - tlendpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605 /* All text outside that line, including its final newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606 must be unchanged */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
607 && (XFASTINT (w->last_modified) >= MODIFF
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 || (beg_unchanged >= tlbufpos - 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
609 && GPT >= tlbufpos
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
610 /* If selective display, can't optimize
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
611 if the changes start at the beginning of the line. */
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
612 && ((XTYPE (current_buffer->selective_display) == Lisp_Int
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
613 && XINT (current_buffer->selective_display) > 0
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
614 ? (beg_unchanged >= tlbufpos
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
615 && GPT > tlbufpos)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
616 : 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617 && end_unchanged >= tlendpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
618 && Z - GPT >= tlendpos)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
619 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
620 if (tlbufpos > BEGV && FETCH_CHAR (tlbufpos - 1) != '\n'
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
621 && (tlbufpos == ZV
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
622 || FETCH_CHAR (tlbufpos) == '\n'))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
623 /* Former continuation line has disappeared by becoming empty */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
624 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 else if (XFASTINT (w->last_modified) < MODIFF
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626 || MINI_WINDOW_P (w))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
627 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
628 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
629 overlay_arrow_seen = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
630 display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
631 pos_tab_offset (w, tlbufpos));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632 /* If line contains point, is not continued,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
633 and ends at same distance from eob as before, we win */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
634 if (cursor_vpos >= 0 && this_line_bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
635 && this_line_endpos == tlendpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
636 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
637 if (XFASTINT (w->width) != FRAME_WIDTH (XFRAME (WINDOW_FRAME (w))))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
638 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
639 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
640 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
641 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
642 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
643 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
644 else if (point == XFASTINT (w->last_point))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
645 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
646 if (!must_finish)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
647 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
649 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
650 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
651 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
652 }
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
653 /* If highlighting the region, we can't just move the cursor. */
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
654 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
655 && !NILP (current_buffer->mark_active))
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
656 && NILP (w->region_showing))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
657 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
658 pos = *compute_motion (tlbufpos, 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
659 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 point, 2, - (1 << (SHORTBITS - 1)),
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
661 window_internal_width (w) - 1,
574
58047bf5d46c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 528
diff changeset
662 XINT (w->hscroll),
58047bf5d46c *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 528
diff changeset
663 pos_tab_offset (w, tlbufpos));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
664 if (pos.vpos < 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
665 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
666 FRAME_CURSOR_X (selected_frame)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
667 = XFASTINT (w->left) + max (pos.hpos, 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
668 FRAME_CURSOR_Y (selected_frame) = this_line_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
669 goto update;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
670 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
671 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
672 goto cancel;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
673 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
674 cancel:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
675 /* Text changed drastically or point moved off of line */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
676 cancel_line (this_line_vpos, selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
677 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
679 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
680 all_windows |= buffer_shared > 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
681
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
682 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
683 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
684 Lisp_Object tail, frame;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
685
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
686 #ifdef HAVE_X_WINDOWS
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
687 /* Since we're doing a thorough redisplay, we might as well
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
688 recompute all our display faces. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
689 clear_face_vector ();
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
690 #endif
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
691
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
692 /* Recompute # windows showing selected buffer.
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
693 This will be incremented each time such a window is displayed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
694 buffer_shared = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
695
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
696 FOR_EACH_FRAME (tail, frame)
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
697 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
698 FRAME_PTR f = XFRAME (frame);
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2189
diff changeset
699
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
700 /* Mark all the scroll bars to be removed; we'll redeem the ones
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
701 we want when we redisplay their windows. */
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
702 if (condemn_scroll_bars_hook)
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
703 (*condemn_scroll_bars_hook) (f);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
704
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
705 if (FRAME_VISIBLE_P (f))
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
706 redisplay_windows (FRAME_ROOT_WINDOW (f));
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
707
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
708 /* Any scroll bars which redisplay_windows should have nuked
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
709 should now go away. */
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
710 if (judge_scroll_bars_hook)
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
711 (*judge_scroll_bars_hook) (f);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
712 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
713 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
714 else if (FRAME_VISIBLE_P (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
715 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
716 redisplay_window (selected_window, 1);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
717 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
718 preserve_other_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
720
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
721 update:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
722 /* Prevent various kinds of signals during display update.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
723 stdio is not robust about handling signals,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
724 which can cause an apparent I/O error. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
726 unrequest_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
727 stop_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
728
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
729 #ifdef MULTI_FRAME
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
730 if (all_windows)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732 Lisp_Object tail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
733
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 pause = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
736 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
738 FRAME_PTR f;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
739
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
740 if (XTYPE (XCONS (tail)->car) != Lisp_Frame)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741 continue;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
742
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
743 f = XFRAME (XCONS (tail)->car);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
744 if (FRAME_VISIBLE_P (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
745 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
746 pause |= update_frame (f, 0, 0);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
747 if (!pause)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
748 mark_window_display_accurate (f->root_window, 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
749 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
750 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
751 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
752 else
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
753 #endif /* MULTI_FRAME */
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
754 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
755 if (FRAME_VISIBLE_P (selected_frame))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
756 pause = update_frame (selected_frame, 0, 0);
1656
a532c5a23984 * xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents: 1600
diff changeset
757
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
758 /* 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
759 function. If the echo area is on another frame, that may
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
760 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
761 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
762 it here. */
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
763 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
764 FRAME_PTR mini_frame =
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
765 XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window)));
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
766
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
767 if (mini_frame != selected_frame)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
768 pause |= update_frame (mini_frame, 0, 0);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
769 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
770 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
771
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
772 /* If frame does not match, prevent doing single-line-update next time.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
773 Also, don't forget to check every line to update the arrow. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
774 if (pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
775 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
776 this_line_bufpos = 0;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
777 if (!NILP (last_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
778 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
779 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
781 }
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
782 /* If we pause after scrolling, some lines in current_frame
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
783 may be null, so preserve_other_columns won't be able to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
784 preserve all the vertical-bar separators. So, avoid using it
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785 in that case. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
786 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787 update_mode_lines = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
788 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
789
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
790 /* Now text on frame agrees with windows, so
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
791 put info into the windows for partial redisplay to follow */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
792
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
793 if (!pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
794 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
795 register struct buffer *b = XBUFFER (w->buffer);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
796
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
797 blank_end_of_window = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
798 clip_changed = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
799 unchanged_modified = BUF_MODIFF (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800 beg_unchanged = BUF_GPT (b) - BUF_BEG (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 end_unchanged = BUF_Z (b) - BUF_GPT (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
803 XFASTINT (w->last_point) = BUF_PT (b);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
804 XFASTINT (w->last_point_x) = FRAME_CURSOR_X (selected_frame);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
805 XFASTINT (w->last_point_y) = FRAME_CURSOR_Y (selected_frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
806
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
807 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
808 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
810 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
811 w->update_mode_line = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
812 XFASTINT (w->last_modified) = BUF_MODIFF (b);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
813 w->window_end_valid = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
814 last_arrow_position = Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 last_arrow_string = Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
816 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
817 update_mode_lines = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
818 windows_or_buffers_changed = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
819 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
820
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
821 /* Start SIGIO interrupts coming again.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
822 Having them off during the code above
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
823 makes it less likely one will discard output,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
824 but not impossible, since there might be stuff
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
825 in the system buffer here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
826 But it is much hairier to try to do anything about that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
827
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
828 if (interrupt_input)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
829 request_sigio ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
830 start_polling ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
831
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
832 /* Change frame size now if a change is pending. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
833 do_pending_window_change ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
834 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
836 /* Redisplay, but leave alone any recent echo area message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
837 unless another message has been requested in its place.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
838
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
839 This is useful in situations where you need to redisplay but no
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
840 user action has occurred, making it inappropriate for the message
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
841 area to be cleared. See tracking_off and
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
842 wait_reading_process_input for examples of these situations. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
843
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
844 redisplay_preserve_echo_area ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
845 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
846 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
847 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
848 echo_area_glyphs = previous_echo_glyphs;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
849 redisplay ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
850 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
851 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
852 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
853 redisplay ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
854 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
855
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
856 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
857 mark_window_display_accurate (window, flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
858 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
859 int flag;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
860 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
861 register struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
863 for (;!NILP (window); window = w->next)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 {
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
865 if (XTYPE (window) != Lisp_Window) abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
868 if (!NILP (w->buffer))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
869 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
870 XFASTINT (w->last_modified)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
871 = !flag ? 0
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
872 : XBUFFER (w->buffer) == current_buffer
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
873 ? MODIFF : BUF_MODIFF (XBUFFER (w->buffer));
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
874
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
875 /* 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
876 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
877 w->region_showing = (!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
878 && !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
879 ? 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
880 : Qnil);
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
881 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
882
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883 w->window_end_valid = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 w->update_mode_line = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
886 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
887 mark_window_display_accurate (w->vchild, flag);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
888 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
889 mark_window_display_accurate (w->hchild, flag);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
892 if (flag)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
893 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
894 last_arrow_position = Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
895 last_arrow_string = Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
896 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
897 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
898 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
899 /* t is unequal to any useful value of Voverlay_arrow_... */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
900 last_arrow_position = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
901 last_arrow_string = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
902 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
904
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
905 /* Update the menu bar item lists for WINDOW
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
906 and its subwindows and siblings.
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
907 This has to be done before we start to fill in any display lines,
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
908 because it can call eval. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
909
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
910 static void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
911 update_menu_bars (window)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
912 Lisp_Object window;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
913 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
914 for (; !NILP (window); window = XWINDOW (window)->next)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
915 update_menu_bar (window, 0);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
916 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
917
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
918 /* Update the menu bar item list for window WINDOW and its subwindows. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
919
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
920 static void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
921 update_menu_bar (window, just_this_one)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
922 Lisp_Object window;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
923 int just_this_one;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
924 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
925 register struct window *w = XWINDOW (window);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
926 struct buffer *old = current_buffer;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
927 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
928
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
929 /* If this is a combination window, do its children; that's all. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
930
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
931 if (!NILP (w->vchild))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
932 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
933 update_menu_bars (w->vchild);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
934 return;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
935 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
936 if (!NILP (w->hchild))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
937 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
938 update_menu_bars (w->hchild);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
939 return;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
940 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
941 if (NILP (w->buffer))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
942 abort ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
943
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
944 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
945 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
946
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
947 /* When we reach a frame's selected window, redo the frame's menu bar. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
948 if (!NILP (w->update_mode_line)
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
949 #ifdef USE_X_TOOLKIT
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
950 && FRAME_EXTERNAL_MENU_BAR (f)
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
951 #else
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
952 && 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
953 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
954 && EQ (FRAME_SELECTED_WINDOW (f), window))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
955 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
956 /* 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
957 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
958 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
959 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
960 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
961 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
962 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
963 if (windows_or_buffers_changed
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
964 || update_mode_lines
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
965 || (XFASTINT (w->last_modified) < MODIFF
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
966 && (XFASTINT (w->last_modified)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
967 <= XBUFFER (w->buffer)->save_modified)))
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
968 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
969 struct buffer *prev = current_buffer;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
970 current_buffer = XBUFFER (w->buffer);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
971 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items ();
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
972 current_buffer = prev;
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
973 #ifdef USE_X_TOOLKIT
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
974 set_frame_menubar (f);
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
975 #endif /* USE_X_TOOLKIT */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
976 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
977 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
978 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
979
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980 int do_id = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
981
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
982 /* Redisplay WINDOW and its subwindows and siblings. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
983
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
984 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
985 redisplay_windows (window)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
986 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
987 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
988 for (; !NILP (window); window = XWINDOW (window)->next)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
989 redisplay_window (window, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
990 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
991
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
992 /* Redisplay window WINDOW and its subwindows. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
993
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 redisplay_window (window, just_this_one)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 int just_this_one;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
999 register struct window *w = XWINDOW (window);
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
1000 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1001 int height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1002 register int lpoint = point;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003 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
1004 register int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1005 register int startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1006 register int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007 struct position pos;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1008 int opoint = point;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1009 int tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1010 int window_needs_modeline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1011
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1012 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1013
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1014 /* If this is a combination window, do its children; that's all. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1015
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1016 if (!NILP (w->vchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1018 redisplay_windows (w->vchild);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1021 if (!NILP (w->hchild))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1022 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1023 redisplay_windows (w->hchild);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1024 return;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1025 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1026 if (NILP (w->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1027 abort ();
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1028
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1029 height = window_internal_height (w);
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1030
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1031 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1032 {
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1033 if (w == XWINDOW (minibuf_window))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1034 {
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1035 if (echo_area_glyphs)
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1036 /* We've already displayed the echo area glyphs, if any. */
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1037 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1038 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1039 else
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1040 {
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1041 /* This is a minibuffer, but it's not the currently active one, so
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1042 clear it. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1043 int vpos = XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1044 int i;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1045
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1046 for (i = 0; i < height; i++)
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1047 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1048 get_display_line (f, vpos + i, 0);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1049 display_string (w, vpos + i, "", 0, 0, 0, 0, width);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1050 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1051
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1052 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1053 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1054 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1055
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 if (update_mode_lines)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1057 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059 /* Otherwise set up data on this window; select its buffer and point value */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 current_buffer = XBUFFER (w->buffer);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1062 opoint = point;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1063
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1064 /* Count number of windows showing the selected buffer. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 if (!just_this_one
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 && current_buffer == XBUFFER (XWINDOW (selected_window)->buffer))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 buffer_shared++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070 /* POINT refers normally to the selected window.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1071 For any other window, set up appropriate value. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1072
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1073 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1074 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1075 SET_PT (marker_position (w->pointm));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076 if (point < BEGV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1078 SET_PT (BEGV);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 Fset_marker (w->pointm, make_number (point), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1080 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 else if (point > (ZV - 1))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1083 SET_PT (ZV);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 Fset_marker (w->pointm, make_number (point), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1089 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1091
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 startp = marker_position (w->start);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1094 /* 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
1095 unless the specified location is outside the accessible range. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1096 if (!NILP (w->force_start))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097 {
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1098 /* 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
1099 w->base_line_number = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1100 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 w->force_start = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 XFASTINT (w->last_modified) = 0;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1103 if (startp < BEGV) startp = BEGV;
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1104 if (startp > ZV) startp = ZV;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 {
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1108 /* ??? What should happen here if highlighting a region? */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 /* If point does not appear, move point so it does appear */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 pos = *compute_motion (startp, 0,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 ((EQ (window, minibuf_window) && startp == 1)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 ? minibuf_prompt_width : 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 +
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114 (hscroll ? 1 - hscroll : 0),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1115 ZV, height / 2,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116 - (1 << (SHORTBITS - 1)),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 width, hscroll, pos_tab_offset (w, startp));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118 SET_PT (pos.bufpos);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
1119 if (w != XWINDOW (selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1120 Fset_marker (w->pointm, make_number (point), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1121 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122 {
5340
fcd6e0da3380 (redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents: 5230
diff changeset
1123 if (current_buffer == old)
fcd6e0da3380 (redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents: 5230
diff changeset
1124 lpoint = point;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1125 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1126 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1127 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1128 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1129 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1130 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1131
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1132 /* Handle case where text has not changed, only point,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1133 and it has not moved off the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1134
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1135 /* This code is not used for minibuffer for the sake of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 the case of redisplaying to replace an echo area message;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 since in that case the minibuffer contents per se are usually unchanged.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1138 This code is of no real use in the minibuffer since
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1139 the handling of this_line_bufpos, etc.,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1140 in redisplay handles the same cases. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1141
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 if (XFASTINT (w->last_modified) >= MODIFF
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1143 && point >= startp && !clip_changed
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1144 && (just_this_one || XFASTINT (w->width) == FRAME_WIDTH (f))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1145 /* 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
1146 && !(!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
1147 && NILP (w->region_showing)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 && !EQ (window, minibuf_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1149 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1151 point, height + 1, 10000, width, hscroll,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 pos_tab_offset (w, startp));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1153
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1154 if (pos.vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1156 /* Ok, point is still on frame */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1157 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1158 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 /* These variables are supposed to be origin 1 */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1160 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1161 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1163 /* 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
1164 this one must be redisplayed, this does nothing because there
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1165 is nothing in DesiredFrame yet, and then the other window is
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 redisplayed, making likes that are empty in this window's columns.
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1167 if (XFASTINT (w->width) != FRAME_WIDTH (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1168 preserve_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1169 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1170 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1171 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1172 /* Don't bother trying redisplay with same start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173 we already know it will lose */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1174 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1176 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1177 else if (!NILP (w->start_at_line_beg)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1178 && !(startp == BEGV
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1179 || FETCH_CHAR (startp - 1) == '\n'))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1180 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1181 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1182 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1183 else if (just_this_one && !MINI_WINDOW_P (w)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1184 && point >= startp
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1185 && 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
1186 /* 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
1187 && ! NILP (w->start_at_line_beg)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1188 && ! EQ (w->window_end_valid, Qnil)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 && do_id && !clip_changed
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1190 && !blank_end_of_window
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1191 && XFASTINT (w->width) == FRAME_WIDTH (f)
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1192 /* 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
1193 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1194 && !NILP (current_buffer->mark_active))
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1195 && NILP (w->region_showing)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196 && EQ (last_arrow_position, Voverlay_arrow_position)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 && EQ (last_arrow_string, Voverlay_arrow_string)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1198 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 && tem != -2)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 /* tem > 0 means success. tem == -1 means choose new start.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202 tem == -2 means try again with same start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 and nothing but whitespace follows the changed stuff.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204 tem == 0 means try again with same start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1205 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1208 else if (startp >= BEGV && startp <= ZV
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1209 /* Avoid starting display at end of buffer! */
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
1210 && (startp < ZV || startp == BEGV
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1211 || (XFASTINT (w->last_modified) >= MODIFF)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1212 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213 /* Try to redisplay starting at same place as before */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1214 /* If point has not moved off frame, accept the results */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1215 try_window (window, startp);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1217 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1218 if (!just_this_one || clip_changed || beg_unchanged < startp)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1219 /* 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
1220 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1221 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1222 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1223 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1224 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1225 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1226
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1227 XFASTINT (w->last_modified) = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1228 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1229
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1230 /* Try to scroll by specified few lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 if (scroll_step && !clip_changed)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 if (point > startp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 pos = *vmotion (Z - XFASTINT (w->window_end_pos),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 scroll_step, width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1238 if (pos.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239 goto scroll_fail;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1240 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1241
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1242 pos = *vmotion (startp, point < startp ? - scroll_step : scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245 if (point >= pos.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1246 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 if (cursor_vpos >= 0)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1249 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1250 if (!just_this_one || clip_changed || beg_unchanged < startp)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1251 /* 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
1252 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1253 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1254 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1255 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1256 cancel_my_columns (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1257 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 scroll_fail: ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1260
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1261 /* Finally, just choose place to start which centers point */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1262
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1263 recenter:
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1264 /* 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
1265 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1266
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1267 pos = *vmotion (point, - height / 2, width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 try_window (window, pos.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1269
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270 startp = marker_position (w->start);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1271 w->start_at_line_beg =
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 (startp == BEGV || FETCH_CHAR (startp - 1) == '\n') ? Qt : Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274 done:
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1275 if ((!NILP (w->update_mode_line)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1276 /* 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
1277 if the window to its side is being redone */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1278 || (!just_this_one && width < FRAME_WIDTH (f) - 1)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1279 || INTEGERP (w->base_line_pos))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1280 && height != XFASTINT (w->height))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1281 display_mode_line (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1282 if (! line_number_displayed
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1283 && ! BUFFERP (w->base_line_pos))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1284 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1285 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1286 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
1287 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1288
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1289 /* When we reach a frame's selected window, redo the frame's menu bar. */
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1290 if (!NILP (w->update_mode_line)
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
1291 #ifdef USE_X_TOOLKIT
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
1292 && FRAME_EXTERNAL_MENU_BAR (f)
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
1293 #else
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1294 && 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
1295 #endif
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1296 && EQ (FRAME_SELECTED_WINDOW (f), window))
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1297 display_menu_bar (w);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
1298
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1299 finish_scroll_bars:
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1300 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
1301 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1302 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1303
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1304 /* 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
1305 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
1306 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
1307 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
1308 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
1309
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1310 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
1311 if (! MINI_WINDOW_P (w)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1312 || (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
1313 {
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
1314 whole = ZV - BEGV;
2904
d9f7768b0d89 * xdisp.c (redisplay_window): Compute the scrollbar start and end
Jim Blandy <jimb@redhat.com>
parents: 2884
diff changeset
1315 start = startp - BEGV;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1316 /* 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
1317 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
1318 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
1319
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
1320 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
1321 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
1322 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1323 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1324 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1325
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1326 /* 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
1327 (*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
1328
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
1329 /* 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
1330 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
1331 (*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
1332 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
1333
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1334 SET_PT (opoint);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335 current_buffer = old;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336 SET_PT (lpoint);
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 /* Do full redisplay on one window, starting at position `pos'. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1340
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1341 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1342 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1343 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1344 register int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1345 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1346 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1347 register int height = window_internal_height (w);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1348 register int vpos = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1349 register int last_text_vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1350 int tab_offset = pos_tab_offset (w, pos);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1351 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
1352 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1353 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1355 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1356 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1357 overlay_arrow_seen = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1358 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1360 while (--height >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1361 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362 val = *display_text_line (w, pos, vpos, val.hpos, tab_offset);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 if (val.vpos) tab_offset = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1365 vpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1366 if (pos != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1367 last_text_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368 /* Next line, unless prev line ended in end of buffer with no cr */
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1369 = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1370 || ! NILP (Fget_text_property (val.bufpos-1,
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1371 Qinvisible,
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1372 Fcurrent_buffer ()))));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1373 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1377 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1381 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1383 && Z != pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1384 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1385
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1386 /* Say where last char on frame will be, once redisplay is finished. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1387 XFASTINT (w->window_end_pos) = Z - pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1388 XFASTINT (w->window_end_vpos) = last_text_vpos - XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1392
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393 /* Try to redisplay when buffer is modified locally,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1394 computing insert/delete line to preserve text outside
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1395 the bounds of the changes.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1396 Return 1 if successful, 0 if if cannot tell what to do,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1397 or -1 to tell caller to find a new window start,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1398 or -2 to tell caller to do normal redisplay with same window start. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1399
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401 try_window_id (window)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 Lisp_Object window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1404 int pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405 register struct window *w = XWINDOW (window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406 register int height = window_internal_height (w);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1407 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 int top = XFASTINT (w->top);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1409 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
1410 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1412 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1413 register int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1414 register int i, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1415 int last_text_vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1416 int stop_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1417
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1418 struct position val, bp, ep, xp, pp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1419 int scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1420 int delta;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1421 int tab_offset, epto;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1422
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423 if (GPT - BEG < beg_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 beg_unchanged = GPT - BEG;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1425 if (Z - GPT < end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1426 end_unchanged = Z - GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427
5739
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
1428 if (beg_unchanged + BEG < start)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429 return 0; /* Give up if changes go above top of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 /* Find position before which nothing is changed. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432 bp = *compute_motion (start, 0, lmargin,
5739
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
1433 min (ZV, beg_unchanged + BEG), height + 1, 0,
0709eb474647 (try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents: 5676
diff changeset
1434 width, hscroll, pos_tab_offset (w, start));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1435 if (bp.vpos >= height)
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1436 {
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1437 if (point < bp.bufpos && !bp.contin)
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1438 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1439 /* All changes are below the frame, and point is on the frame.
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1440 We don't need to change the frame at all.
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1441 But we need to update window_end_pos to account for
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1442 any change in buffer size. */
371
54ac13a6f74e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 368
diff changeset
1443 bp = *compute_motion (start, 0, lmargin,
54ac13a6f74e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 368
diff changeset
1444 Z, height, 0,
54ac13a6f74e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 368
diff changeset
1445 width, hscroll, pos_tab_offset (w, start));
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1446 XFASTINT (w->window_end_vpos) = height;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1447 XFASTINT (w->window_end_pos) = Z - bp.bufpos;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1448 return 1;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1449 }
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1450 return 0;
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
1451 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1453 vpos = bp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1454
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1455 /* Find beginning of that frame line. Must display from there. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456 bp = *vmotion (bp.bufpos, 0, width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 val.hpos = lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 if (pos < start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461 return -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1462
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 /* 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
1464 really start with previous frame line, in case it was not
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1465 continued when last redisplayed */
528
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1466 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0)
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1467 ||
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1468 /* Likewise if we have to worry about selective display. */
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1469 (XTYPE (current_buffer->selective_display) == Lisp_Int
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1470 && XINT (current_buffer->selective_display) > 0
5af35411366a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1471 && bp.bufpos - 1 == beg_unchanged && vpos > 0))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1472 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1473 bp = *vmotion (bp.bufpos, -1, width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1474 --vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1475 pos = bp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1476 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1477
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1478 if (bp.contin && bp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1479 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480 val.hpos = bp.prevhpos - width + lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1481 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1483
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1484 bp.vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1485
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 /* Find first visible newline after which no more is changed. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 tem = find_next_newline (Z - max (end_unchanged, Z - ZV), 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 if (XTYPE (current_buffer->selective_display) == Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489 && XINT (current_buffer->selective_display) > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490 while (tem < ZV - 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1491 && (position_indentation (tem)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492 >= XINT (current_buffer->selective_display)))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 tem = find_next_newline (tem, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1494
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1495 /* Compute the cursor position after that newline. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1496 ep = *compute_motion (pos, vpos, val.hpos, tem,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1497 height, - (1 << (SHORTBITS - 1)),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1498 width, hscroll, pos_tab_offset (w, bp.bufpos));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1499
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1500 /* If changes reach past the text available on the frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1501 just display rest of frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1502 if (ep.bufpos > Z - XFASTINT (w->window_end_pos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1503 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1504 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1505 stop_vpos = ep.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1506
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1507 /* If no newline before ep, the line ep is on includes some changes
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1508 that must be displayed. Make sure we don't stop before it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1509 /* Also, if changes reach all the way until ep.bufpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1510 it is possible that something was deleted after the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1511 newline before it, so the following line must be redrawn. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1512 if (stop_vpos == ep.vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1513 && (ep.bufpos == BEGV
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1514 || FETCH_CHAR (ep.bufpos - 1) != '\n'
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1515 || ep.bufpos == Z - end_unchanged))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1516 stop_vpos = ep.vpos + 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1518 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1519 overlay_arrow_seen = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1520
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1521 /* If changes do not reach to bottom of window,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1522 figure out how much to scroll the rest of the window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 if (stop_vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525 /* Now determine how far up or down the rest of the window has moved */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526 epto = pos_tab_offset (w, ep.bufpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 Z - XFASTINT (w->window_end_pos),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 10000, 0, width, hscroll, epto);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1530 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1532 /* Is everything on frame below the changes whitespace?
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 If so, no scrolling is really necessary. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 for (i = ep.bufpos; i < xp.bufpos; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 tem = FETCH_CHAR (i);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1537 if (tem != ' ' && tem != '\n' && tem != '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1538 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1540 if (i == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 XFASTINT (w->window_end_vpos) += scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1545 /* Before doing any scrolling, verify that point will be on frame. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 if (point > ep.bufpos && !(point <= xp.bufpos && xp.bufpos < height))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1547 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1548 if (point <= xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1549 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550 pp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1551 point, height, - (1 << (SHORTBITS - 1)),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 width, hscroll, epto);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1553 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1554 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1555 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1556 pp = *compute_motion (xp.bufpos, xp.vpos, xp.hpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1557 point, height, - (1 << (SHORTBITS - 1)),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558 width, hscroll, pos_tab_offset (w, xp.bufpos));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1560 if (pp.bufpos < point || pp.vpos == height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1561 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562 cursor_vpos = pp.vpos + top;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1563 cursor_hpos = pp.hpos + XFASTINT (w->left);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1565
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566 if (stop_vpos - scroll_amount >= height
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1567 || ep.bufpos == xp.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1569 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1570 stop_vpos -= scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1571 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1572 /* In this path, we have altered window_end_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1573 and not left it negative.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1574 We must make sure that, in case display is preempted
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1575 before the frame changes to reflect what we do here,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1576 further updates will not come to try_window_id
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1577 and assume the frame and window_end_vpos match. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1578 blank_end_of_window = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1579 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1580 else if (!scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1581 {}
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1582 else if (bp.bufpos == Z - end_unchanged)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1583 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1585 don't bother scrolling. Can happen if lines are short. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1586 if (scroll_cost (f, bp.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1587 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1588 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1589 > xp.bufpos - bp.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1590 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1591 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1592 return -2;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1593 /* If pure deletion, scroll up as many lines as possible.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1594 In common case of killing a line, this can save the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1595 following line from being overwritten by scrolling
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1596 and therefore having to be redrawn. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1597 tem = scroll_frame_lines (f, bp.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1598 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1599 scroll_amount);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1600 if (!tem) stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1601 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602 else if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1604 /* If reprinting everything is nearly as fast as scrolling,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605 don't bother scrolling. Can happen if lines are short. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1606 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1607 overestimate of cost of reprinting, since xp.bufpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1608 would end up below the bottom of the window. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1609 if (scroll_cost (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1610 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1611 scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1612 > xp.bufpos - ep.bufpos - 20)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 /* Return "try normal display with same window-start."
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1614 Too bad we can't prevent further scroll-thinking. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1615 return -2;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1616 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1617 top + height - max (0, scroll_amount),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1618 scroll_amount);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1619 if (!tem) stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1620 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1621 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1622
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1623 /* In any case, do not display past bottom of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1624 if (stop_vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1625 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1626 stop_vpos = height;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1627 scroll_amount = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1628 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1629
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1630 /* Handle case where pos is before w->start --
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1631 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
1632 if (vpos == 0 && pos < marker_position (w->start))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633 Fset_marker (w->start, make_number (pos), Qnil);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1634
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 /* Redisplay the lines where the text was changed */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636 last_text_vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1637 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1638 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1639 to account for passing the line that that character really starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642 while (vpos < stop_vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1646 if (val.vpos) tab_offset = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1647 if (pos != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 last_text_vpos
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1649 /* Next line, unless prev line ended in end of buffer with no cr */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1650 = vpos - (val.vpos && FETCH_CHAR (val.bufpos - 1) != '\n');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1651 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1652 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1653
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1654 /* There are two cases:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1655 1) we have displayed down to the bottom of the window
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1656 2) we have scrolled lines below stop_vpos by scroll_amount */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1658 if (vpos == height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1659 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1660 /* If last line is continued in middle of character,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1661 include the split character in the text considered on the frame */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1662 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 val.bufpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1664 XFASTINT (w->window_end_vpos) = last_text_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1665 XFASTINT (w->window_end_pos) = Z - val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1666 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1667
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1668 /* If scrolling made blank lines at window bottom,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 redisplay to fill those lines */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1670 if (scroll_amount < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1671 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1672 /* Don't consider these lines for general-purpose scrolling.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1673 That will save time in the scrolling computation. */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1674 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1675 vpos = xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1676 pos = xp.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1677 val.hpos = lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1678 if (pos == ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1679 vpos = height + scroll_amount;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1680 else if (xp.contin && xp.hpos != lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1681 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1682 val.hpos = xp.prevhpos - width + lmargin;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1684 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1685
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1686 blank_end_of_window = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1687 tab_offset = pos_tab_offset (w, pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1688 /* If we are starting display in mid-character, correct tab_offset
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1689 to account for passing the line that that character starts in. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1690 if (val.hpos < lmargin)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1691 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1692
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1693 while (vpos < height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1694 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1695 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1696 tab_offset += width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1697 if (val.vpos) tab_offset = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1698 pos = val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1700
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701 /* Here is a case where display_text_line sets cursor_vpos wrong.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 Make it be fixed up, below. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1703 if (xp.bufpos == ZV
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1704 && xp.bufpos == point)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 cursor_vpos = -1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1707
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1708 /* If bottom just moved off end of frame, change mode line percentage. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1709 if (XFASTINT (w->window_end_pos) == 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1710 && Z != val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1711 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1712
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1713 /* Attempt to adjust end-of-text positions to new bottom line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1714 if (scroll_amount)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1715 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 delta = height - xp.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717 if (delta < 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1718 || (delta > 0 && xp.bufpos <= ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1719 || (delta == 0 && xp.hpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721 val = *vmotion (Z - XFASTINT (w->window_end_pos),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 delta, width, hscroll, window);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 XFASTINT (w->window_end_pos) = Z - val.bufpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 XFASTINT (w->window_end_vpos) += val.vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1725 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1726 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728 w->window_end_valid = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730 /* If point was not in a line that was displayed, find it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 if (cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1733 val = *compute_motion (start, 0, lmargin, point, 10000, 10000,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734 width, hscroll, pos_tab_offset (w, start));
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1735 /* Admit failure if point is off frame now */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1736 if (val.vpos >= height)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1737 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1738 for (vpos = 0; vpos < height; vpos++)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1739 cancel_line (vpos + top, f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1740 return 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1741 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1742 cursor_vpos = val.vpos + top;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1743 cursor_hpos = val.hpos + XFASTINT (w->left);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1744 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1745
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1746 FRAME_CURSOR_X (f) = max (0, cursor_hpos);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1747 FRAME_CURSOR_Y (f) = cursor_vpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1748
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1749 if (debug_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1750 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1751 val = *compute_motion (start, 0, lmargin, ZV,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1752 height, - (1 << (SHORTBITS - 1)),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1753 width, hscroll, pos_tab_offset (w, start));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1754 if (val.vpos != XFASTINT (w->window_end_vpos))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 if (XFASTINT (w->window_end_pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1757 != Z - val.bufpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1758 abort ();
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1759 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1760
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1761 return 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1762 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1763
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1764 /* Mark a section of BUF as modified, but only for the sake of redisplay.
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1765 This is useful for recording changes to overlays.
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1766
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1767 We increment the buffer's modification timestamp and set the
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1768 redisplay caches (windows_or_buffers_changed, beg_unchanged, etc)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1769 as if the region of text between START and END had been modified;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1770 the redisplay code will check this against the windows' timestamps,
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1771 and redraw the appropriate area of the buffer.
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1772
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1773 However, if the buffer is unmodified, we bump the last-save
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1774 timestamp as well, so that incrementing the timestamp doesn't fool
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1775 Emacs into thinking that the buffer's text has been modified.
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1776
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1777 Tweaking the timestamps shouldn't hurt the first-modification
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1778 timestamps recorded in the undo records; those values aren't
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1779 written until just before a real text modification is made, so they
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1780 will never catch the timestamp value just before this function gets
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1781 called. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1782
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1783 void
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1784 redisplay_region (buf, start, end)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1785 struct buffer *buf;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1786 int start, end;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1787 {
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1788 if (start == end)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1789 return;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1790
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1791 if (start > end)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1792 {
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1793 int temp = start;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1794 start = end; end = temp;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1795 }
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1796
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1797 if (buf != current_buffer)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1798 windows_or_buffers_changed = 1;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1799 else
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1800 {
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1801 if (unchanged_modified == MODIFF)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1802 {
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1803 beg_unchanged = start - BEG;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1804 end_unchanged = Z - end;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1805 }
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1806 else
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1807 {
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1808 if (Z - end < end_unchanged)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1809 end_unchanged = Z - end;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1810 if (start - BEG < beg_unchanged)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1811 beg_unchanged = start - BEG;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1812 }
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1813 }
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1814
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1815 /* Increment the buffer's time stamp, but also increment the save
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1816 and autosave timestamps, so as not to screw up that timekeeping. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1817 if (BUF_MODIFF (buf) == buf->save_modified)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1818 buf->save_modified++;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1819 if (BUF_MODIFF (buf) == buf->auto_save_modified)
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1820 buf->auto_save_modified++;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1821
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1822 BUF_MODIFF (buf) ++;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1823 }
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1824
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1825
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1826 /* Copy glyphs from the vector FROM to the rope T.
301
2fb0312f83c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 277
diff changeset
1827 But don't actually copy the parts that would come in before S.
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1828 Value is T, advanced past the copied data. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 GLYPH *
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1831 copy_rope (t, s, from, face)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 register GLYPH *t; /* Copy to here. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 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
1834 Lisp_Object from; /* Data to copy; known to be a vector. */
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1835 int face; /* Face to apply to glyphs which don't specify one. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 {
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1837 register int n = XVECTOR (from)->size;
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1838 register Lisp_Object *f = XVECTOR (from)->contents;
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1839
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1840 while (n--)
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1841 {
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1842 int glyph = XFASTINT (*f);
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1843
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1844 if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1845 (GLYPH_FACE (glyph)
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1846 ? GLYPH_FACE (glyph)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1847 : face));
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1848 ++t;
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1849 ++f;
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1850 }
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1851 return t;
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1852 }
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1853
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1854 /* Copy exactly LEN glyphs from FROM into data at T.
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1855 But don't alter words before S. */
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1856
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1857 GLYPH *
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1858 copy_part_of_rope (t, s, from, len, face)
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1859 register GLYPH *t; /* Copy to here. */
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1860 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
1861 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
1862 int len;
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1863 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
1864 {
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1865 int n = len;
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1866 register Lisp_Object *f = from;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1868 while (n--)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1869 {
3689
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1870 int glyph = XFASTINT (*f);
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1871
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1872 if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1873 (GLYPH_FACE (glyph)
82856e3ea14d (echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents: 3648
diff changeset
1874 ? GLYPH_FACE (glyph)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
1875 : face));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876 ++t;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1877 ++f;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1878 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1879 return t;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1880 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1881
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1882 /* Display one line of window w, starting at position START in W's buffer.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1883 Display starting at horizontal position HPOS, which is normally zero
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1884 or negative. A negative value causes output up to hpos = 0 to be discarded.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1885 This is done for negative hscroll, or when this is a continuation line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1886 and the continuation occurred in the middle of a multi-column character.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1890 Display on position VPOS on the frame. (origin 0).
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892 Returns a STRUCT POSITION giving character to start next line with
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893 and where to display it, including a zero or negative hpos.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894 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
1895
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1896 struct position val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1897
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1898 static struct position *
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 display_text_line (w, start, vpos, hpos, taboffset)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901 int start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1902 int vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1903 int hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1904 int taboffset;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1905 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1906 register int pos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907 register int c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1909 int end;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1910 register int pause;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1911 register unsigned char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1912 GLYPH *endp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913 register GLYPH *startp;
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
1914 register GLYPH *p1prev = 0;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1915 FRAME_PTR f = XFRAME (w->frame);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 int tab_width = XINT (current_buffer->tab_width);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1917 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
1918 int width = window_internal_width (w) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919 struct position val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1920 int lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1921 int invis;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1922 int hscroll = XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1923 int truncate = hscroll
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1924 || (truncate_partial_width_windows
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1925 && XFASTINT (w->width) < FRAME_WIDTH (f))
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1926 || !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
1927
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1928 /* 1 if we should highlight the region. */
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1929 int highlight_region
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1930 = !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
1931 int region_beg, region_end;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1932
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1933 int selective
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1934 = XTYPE (current_buffer->selective_display) == Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 ? XINT (current_buffer->selective_display)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
1936 : !NILP (current_buffer->selective_display) ? -1 : 0;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1937 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1938 register struct Lisp_Vector *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
1939
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1940 Lisp_Object default_invis_vector[3];
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1941 /* Nonzero means display something where 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
1942 The precise value is the number of glyphs to display. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1943 int selective_rlen
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
1944 = (selective && dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1945 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1946 : selective && !NILP (current_buffer->selective_display_ellipses)
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1947 ? 3 : 0);
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1948 /* 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
1949 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
1950 Lisp_Object *invis_vector_contents
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1951 = (dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1952 ? 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
1953 : default_invis_vector);
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1954
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955 GLYPH truncator = (dp == 0 || XTYPE (DISP_TRUNC_GLYPH (dp)) != Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1956 ? '$' : XINT (DISP_TRUNC_GLYPH (dp)));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1957 GLYPH continuer = (dp == 0 || XTYPE (DISP_CONTINUE_GLYPH (dp)) != Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1958 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp)));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1960 /* 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
1961 to overlays or text property changes. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1962 int next_face_change;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1963
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1964 #ifdef USE_TEXT_PROPERTIES
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1965 /* The next location where the `invisible' property changes */
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1966 int next_invisible;
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1967 #endif
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
1968
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1969 /* 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
1970 int current_face = 0;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
1971
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
1972 XFASTINT (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
1973 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
1974
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1975 hpos += XFASTINT (w->left);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
1976 get_display_line (f, vpos, XFASTINT (w->left));
2324
24cd3df6f184 (display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents: 2303
diff changeset
1977 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1978
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1979 /* Show where to highlight the region. */
2965
5314fdcd87bc (display_text_line): Highlight in any frame's sel window.
Richard M. Stallman <rms@gnu.org>
parents: 2929
diff changeset
1980 if (highlight_region && XMARKER (current_buffer->mark)->buffer != 0
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
1981 /* 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
1982 && (highlight_nonselected_windows
3266
1173bc4814da (display_text_line): Really check for just the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3265
diff changeset
1983 || w == XWINDOW (selected_window)))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1984 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1985 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
1986 if (PT < region_beg)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1987 {
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1988 region_end = region_beg;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1989 region_beg = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1990 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1991 else
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1992 region_end = PT;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1993 w->region_showing = Qt;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1994 }
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1995 else
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1996 region_beg = region_end = -1;
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
1997
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 if (MINI_WINDOW_P (w) && start == 1
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1999 && vpos == XFASTINT (w->top))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001 if (minibuf_prompt)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2002 hpos = display_string (w, vpos, minibuf_prompt, -1, hpos,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003 (!truncate ? continuer : truncator),
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004 -1, -1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 minibuf_prompt_width = hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 desired_glyphs->bufp[vpos] = pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 p1 = desired_glyphs->glyphs[vpos] + hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2010 end = ZV;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011 startp = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012 endp = startp + width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2014 /* 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
2015 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
2016 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
2017 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
2018 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
2019 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
2020
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021 /* Loop generating characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 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
2023 if reach or pass continuation column,
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2024 or at face change. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 pause = pos;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2026 next_face_change = pos;
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2027 #ifdef USE_TEXT_PROPERTIES
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2028 next_invisible = pos;
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2029 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2030 while (p1 < endp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2031 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2032 p1prev = p1;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2033 if (pos >= pause)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2034 {
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2035 /* Did we hit the end of the visible region of the buffer?
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2036 Stop here. */
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2037 if (pos >= end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2038 break;
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2039
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2040 /* Did we reach point? Record the cursor location. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2041 if (pos == point && cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2042 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2043 cursor_vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2044 cursor_hpos = p1 - startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2046
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2047 #ifdef USE_TEXT_PROPERTIES
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2048 /* if the `invisible' property is set to t, we can skip to
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2049 the next property change */
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2050 while (pos == next_invisible && pos < end)
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2051 {
5082
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2052 Lisp_Object position, limit, endpos, prop;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2053 XFASTINT (position) = pos;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2054 prop = Fget_text_property (position, Qinvisible,
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2055 Fcurrent_buffer ());
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2056 /* This is just an estimate to give reasonable
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2057 performance; nothing should go wrong if it is too small. */
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2058 XFASTINT (limit) = pos + 50;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2059 endpos
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2060 = Fnext_single_property_change (position, Qinvisible,
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2061 Fcurrent_buffer (), limit);
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2062 if (INTEGERP (endpos))
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2063 next_invisible = XINT (endpos);
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2064 else
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2065 next_invisible = end;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2066 if (! NILP (prop))
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2067 {
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2068 if (pos < point && next_invisible >= point)
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2069 {
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2070 cursor_vpos = vpos;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2071 cursor_hpos = p1 - startp;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2072 }
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2073 pos = next_invisible;
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2074 }
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2075 }
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2076 if (pos >= end)
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2077 break;
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2078 #endif
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2079
2742
7800e6a86421 * xdisp.c (display_text_line): Make face-handling code conditional
Jim Blandy <jimb@redhat.com>
parents: 2729
diff changeset
2080 #ifdef HAVE_X_WINDOWS
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2081 /* Did we hit a face change? Figure out what face we should
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2082 use now. We also hit this the first time through the
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2083 loop, to see what face we should start with. */
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2084 if (pos >= next_face_change && FRAME_X_P (f))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2085 current_face = compute_char_face (f, w, pos,
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
2086 region_beg, region_end,
5082
47a76678bf4d (display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2087 &next_face_change, pos + 50);
2742
7800e6a86421 * xdisp.c (display_text_line): Make face-handling code conditional
Jim Blandy <jimb@redhat.com>
parents: 2729
diff changeset
2088 #endif
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2089
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2090 pause = end;
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2091
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2092 #ifdef USE_TEXT_PROPERTIES
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2093 if (pos < next_invisible && next_invisible < pause)
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2094 pause = next_invisible;
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
2095 #endif
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2096 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
2097 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
2098
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2099 /* 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
2100 the phone? */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2101 if (pos < point && point < pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2102 pause = point;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2103 if (pos < GPT && GPT < pause)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2104 pause = GPT;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2105
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2106 p = &FETCH_CHAR (pos);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2108 c = *p++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 if (c >= 040 && c < 0177
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
2110 && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2111 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112 if (p1 >= startp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2113 *p1 = MAKE_GLYPH (c, current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2114 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2115 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116 else if (c == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2118 invis = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2119 while (pos < end
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2120 && selective > 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 && position_indentation (pos + 1) >= selective)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2122 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2123 invis = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124 pos = find_next_newline (pos + 1, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125 if (FETCH_CHAR (pos - 1) == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2128 if (invis && selective_rlen > 0 && p1 >= startp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2129 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2130 p1 += selective_rlen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2131 if (p1 - startp > width)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2132 p1 = endp;
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2133 copy_part_of_rope (p1prev, p1prev, invis_vector_contents,
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2134 (p1 - p1prev), current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2135 }
2884
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2136 #if 1
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2137 /* 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
2138 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
2139 if (current_face)
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2140 while (p1 < endp)
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2141 *p1++ = MAKE_GLYPH (' ', current_face);
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2142 #endif
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2143 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2144 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2147 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2148 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2149 if (p1 >= startp && p1 < endp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2150 *p1 = MAKE_GLYPH (' ', current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2151 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2152 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2153 while ((p1 - startp + taboffset + hscroll - (hscroll > 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2154 % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2155 }
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2156 else if (c == Ctl ('M') && selective == -1)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2157 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2158 pos = find_next_newline (pos, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2159 if (FETCH_CHAR (pos - 1) == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2160 pos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2161 if (selective_rlen > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2162 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2163 p1 += selective_rlen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2164 if (p1 - startp > width)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2165 p1 = endp;
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2166 copy_part_of_rope (p1prev, p1prev, invis_vector_contents,
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2167 (p1 - p1prev), current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2168 }
2884
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2169 #if 1
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2170 /* 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
2171 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
2172 if (current_face)
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2173 while (p1 < endp)
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2174 *p1++ = MAKE_GLYPH (' ', current_face);
e52ea063421a * xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents: 2874
diff changeset
2175 #endif
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
2176 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2177 }
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
2178 else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 {
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2180 p1 = copy_rope (p1, startp, DISP_CHAR_VECTOR (dp, c), current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2182 else if (c < 0200 && ctl_arrow)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2183 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2184 if (p1 >= startp)
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2185 *p1 = MAKE_GLYPH ((dp && XTYPE (DISP_CTRL_GLYPH (dp)) == Lisp_Int
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2186 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'),
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2187 current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2188 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2189 if (p1 >= startp && p1 < endp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2190 *p1 = MAKE_GLYPH (c ^ 0100, current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2191 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2192 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2193 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2194 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2195 if (p1 >= startp)
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2196 *p1 = MAKE_GLYPH ((dp && XTYPE (DISP_ESCAPE_GLYPH (dp)) == Lisp_Int
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2197 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2198 current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2199 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2200 if (p1 >= startp && p1 < endp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2201 *p1 = MAKE_GLYPH ((c >> 6) + '0', current_face);
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2202 p1++;
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2203 if (p1 >= startp && p1 < endp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2204 *p1 = MAKE_GLYPH ((7 & (c >> 3)) + '0', current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2205 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
2206 if (p1 >= startp && p1 < endp)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
2207 *p1 = MAKE_GLYPH ((7 & c) + '0', current_face);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2208 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2209 }
2729
76afd3322533 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2526
diff changeset
2210
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2211 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2212 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2213
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2214 val.hpos = - XINT (w->hscroll);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2215 if (val.hpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2216 val.hpos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2217
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2218 val.vpos = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2219
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2220 lastpos = pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2221
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2222 /* Handle continuation in middle of a character */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2223 /* by backing up over it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2224 if (p1 > endp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 {
3586
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2226 /* 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
2227 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
2228 if (p1prev)
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2229 {
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2230 /* Start the next line with that same character */
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2231 pos--;
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2232 /* but at negative hpos, to skip the columns output on this line. */
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2233 val.hpos += p1prev - endp;
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2234 }
7d077274d4bb * xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents: 3516
diff changeset
2235
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2236 /* Keep in this line everything up to the continuation column. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237 p1 = endp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2238 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2239
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 /* Finish deciding which character to start the next line on,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2241 and what hpos to start it at.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242 Also set `lastpos' to the last position which counts as "on this line"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2243 for cursor-positioning. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2244
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2245 if (pos < ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2246 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2247 if (FETCH_CHAR (pos) == '\n')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2248 /* If stopped due to a newline, start next line after it */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2249 pos++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2250 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2251 /* Stopped due to right margin of window */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2252 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2253 if (truncate)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2254 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2255 *p1++ = truncator;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2256 /* Truncating => start next line after next newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2257 and point is on this line if it is before the newline,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2258 and skip none of first char of next line */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2259 pos = find_next_newline (pos, 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2260 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2261
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2262 lastpos = pos - (FETCH_CHAR (pos - 1) == '\n');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2264 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2265 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2266 *p1++ = continuer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2267 val.vpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2268 lastpos--;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2269 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2270 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2271 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2272
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2273 /* 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
2274 record its frame location now. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2275
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2276 if (start <= point && point <= lastpos && cursor_vpos < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2277 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2278 cursor_vpos = vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2279 cursor_hpos = p1 - startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2280 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282 if (cursor_vpos == vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284 if (cursor_hpos < 0) cursor_hpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2285 if (cursor_hpos > width) cursor_hpos = width;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2286 cursor_hpos += XFASTINT (w->left);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2287 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2288 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2289 FRAME_CURSOR_Y (f) = cursor_vpos;
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2290 FRAME_CURSOR_X (f) = cursor_hpos;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2291
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2292 if (w == XWINDOW (selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2293 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2294 /* Line is not continued and did not start
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2295 in middle of character */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2296 if ((hpos - XFASTINT (w->left)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2297 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2298 && val.vpos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2299 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300 this_line_bufpos = start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301 this_line_buffer = current_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2302 this_line_vpos = cursor_vpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2303 this_line_start_hpos = hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2304 this_line_endpos = Z - lastpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2305 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2306 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2307 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2308 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2309 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2310 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2311
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2312 /* If hscroll and line not empty, insert truncation-at-left marker */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313 if (hscroll && lastpos != start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2314 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2315 *startp = truncator;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2316 if (p1 <= startp)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2317 p1 = startp + 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2318 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2319
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2320 if (XFASTINT (w->width) + XFASTINT (w->left) != FRAME_WIDTH (f))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 endp++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323 if (p1 < startp) p1 = startp;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 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
2325
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2326 /* 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
2327 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
2328 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
2329 reconfigured. */
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
2330 *p1++ = (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
2331 ? ' ' : '|');
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334 p1 - desired_glyphs->glyphs[vpos]);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337 /* If the start of this line is the overlay arrow-position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2338 then put the arrow string into the display-line. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340 if (XTYPE (Voverlay_arrow_position) == Lisp_Marker
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2341 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342 && start == marker_position (Voverlay_arrow_position)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2343 && XTYPE (Voverlay_arrow_string) == Lisp_String
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2345 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2346 unsigned char *p = XSTRING (Voverlay_arrow_string)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2347 int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2348 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
2349 int arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2350
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2351 if (len > width)
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2352 len = width;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2353 for (i = 0; i < len; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2354 startp[i] = p[i];
3726
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
2355
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
2356 /* Bug in SunOS 4.1.1 compiler requires this intermediate variable. */
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
2357 arrow_end = (startp - desired_glyphs->glyphs[vpos]) + len;
33e82e88a210 * xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents: 3689
diff changeset
2358 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
2359 desired_glyphs->used[vpos] = arrow_end;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2360
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2361 overlay_arrow_seen = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2362 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2363
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2364 val.bufpos = pos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2365 val_display_text_line = val;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2366 return &val_display_text_line;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2367 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2369 /* 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
2370
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2371 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2372 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2373 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2374 {
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2375 Lisp_Object items, tail;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2376 register int vpos = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2377 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2378 int maxendcol = FRAME_WIDTH (f);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2379 int hpos = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2380
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2381 #ifndef USE_X_TOOLKIT
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2382 if (FRAME_MENU_BAR_LINES (f) <= 0)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2383 return;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2384
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2385 get_display_line (f, vpos, 0);
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2386
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2387 for (tail = FRAME_MENU_BAR_ITEMS (f); CONSP (tail); tail = XCONS (tail)->cdr)
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2388 {
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2389 Lisp_Object string;
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2390
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2391 string = XCONS (XCONS (XCONS (tail)->car)->cdr)->car;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2392
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2393 /* Record in each item its hpos. */
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2394 XFASTINT (XCONS (XCONS (XCONS (tail)->car)->cdr)->cdr) = hpos;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2395
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2396 if (hpos < maxendcol)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2397 hpos = display_string (XWINDOW (FRAME_ROOT_WINDOW (f)), vpos,
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2398 XSTRING (string)->data,
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2399 XSTRING (string)->size,
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2400 hpos, 0, hpos, maxendcol);
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2401 /* Put a gap of 3 spaces between items. */
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2402 if (hpos < maxendcol)
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2403 {
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2404 int hpos1 = hpos + 3;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2405 hpos = display_string (w, vpos, "", 0, hpos, 0,
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2406 min (hpos1, maxendcol), maxendcol);
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2407 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2408 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2409
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2410 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2411 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
2412
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
2413 /* 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
2414 if (maxendcol > hpos)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2415 hpos = display_string (w, vpos, "", 0, hpos, 0, maxendcol, -1);
4423
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
2416
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
2417 /* 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
2418 vpos++;
53f7c5b30816 * xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents: 4386
diff changeset
2419 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
2420 get_display_line (f, vpos++, 0);
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2421 #endif /* not USE_X_TOOLKIT */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2422 }
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
2423
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2424 /* Display the mode line for window w */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2425
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426 static void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2427 display_mode_line (w)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2428 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2429 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2430 register int vpos = XFASTINT (w->height) + XFASTINT (w->top) - 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431 register int left = XFASTINT (w->left);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 register int right = XFASTINT (w->width) + left;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2433 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2434
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2435 line_number_displayed = 0;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2436
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2437 get_display_line (f, vpos, left);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438 display_mode_element (w, vpos, left, 0, right, right,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2439 current_buffer->mode_line_format);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2440 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2441
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 /* Make the mode line inverse video if the entire line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443 is made of mode lines.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2444 I.e. if this window is full width,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2445 or if it is the child of a full width window
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2446 (which implies that that window is split side-by-side
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2447 and the rest of this line is mode lines of the sibling windows). */
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2448 if (XFASTINT (w->width) == FRAME_WIDTH (f)
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2449 || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2450 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 #ifdef HAVE_X_WINDOWS
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 /* I'm trying this out because I saw Unimpress use it, but it's
1124
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2454 possible that this may mess adversely with some window managers. -jla
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2455
1124
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2456 Wouldn't it be nice to use something like mode-line-format to
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2457 describe frame titles? -JimB */
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2458
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2459 /* Change the title of the frame to the name of the buffer displayed
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2460 in the currently selected window. Don't do this for minibuffer frames,
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2461 and don't do it when there's only one non-minibuffer frame. */
973
52267046b144 * xdisp.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Jim Blandy <jimb@redhat.com>
parents: 831
diff changeset
2462 if (FRAME_X_P (f)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2463 && ! FRAME_MINIBUF_ONLY_P (f)
831
dcfb4a00adb3 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 827
diff changeset
2464 && w == XWINDOW (f->selected_window))
1124
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2465 x_implicitly_set_name (f, (EQ (Fnext_frame (WINDOW_FRAME (w), Qnil),
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2466 WINDOW_FRAME (w))
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2467 ? Qnil
453c24f2bdaa * xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents: 1017
diff changeset
2468 : XBUFFER (w->buffer)->name),
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
2469 Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473 /* Contribute ELT to the mode line for window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2474 How it translates into text depends on its data type.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476 VPOS is the position of the mode line being displayed.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2478 HPOS is the position (absolute on frame) where this element's text
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2479 should start. The output is truncated automatically at the right
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2480 edge of window W.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2485 MINENDCOL is the hpos before which the element may not end.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2486 The element is padded at the right with spaces if nec
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 to reach this column.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2489 MAXENDCOL is the hpos past which this element may not extend.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2490 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2491 (This is necessary to make nested padding and truncation work.)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2492
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2493 Returns the hpos of the end of the text generated by ELT.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2494 The next element will receive that value as its HPOS arg,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2495 so as to concatenate the elements. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2496
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2497 static int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2498 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2499 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2500 register int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2501 int depth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2502 int minendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2503 register int maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2504 register Lisp_Object elt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2505 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2506 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2507 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2508 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2509
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2510 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2511
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2512 #ifdef SWITCH_ENUM_BUG
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 switch ((int) XTYPE (elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2514 #else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515 switch (XTYPE (elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2516 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2517 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2518 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2520 /* A string: output it and check for %-constructs within it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 register unsigned char c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522 register unsigned char *this = XSTRING (elt)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2523
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2524 while (hpos < maxendcol && *this)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2525 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526 unsigned char *last = this;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2527 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528 ;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2529 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2531 register int lim = --this - last + hpos;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2532 hpos = display_string (w, vpos, last, -1, hpos, 0, hpos,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2533 min (lim, maxendcol));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2536 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2537 register int spec_width = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2538
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2539 /* We can't allow -ve args due to the "%-" construct */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2540 /* Argument specifies minwidth but not maxwidth
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2541 (maxwidth can be specified by
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2542 (<negative-number> . <stuff>) mode-line elements) */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2543
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2544 while ((c = *this++) >= '0' && c <= '9')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2545 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2546 spec_width = spec_width * 10 + (c - '0');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2548
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549 spec_width += hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2550 if (spec_width > maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2551 spec_width = maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2552
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2553 if (c == 'M')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2555 spec_width, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2556 Vglobal_mode_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2557 else if (c != 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2558 hpos = display_string (w, vpos,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2559 decode_mode_spec (w, c,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2560 maxendcol - hpos),
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2561 -1,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 hpos, 0, spec_width, maxendcol);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2567
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2568 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2569 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2570 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2571 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2576 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2580 don't check for % within it. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 if (XTYPE (tem) == Lisp_String)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2582 hpos = display_string (w, vpos, XSTRING (tem)->data,
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2583 XSTRING (tem)->size,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2584 hpos, 0, minendcol, maxendcol);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 /* Give up right away for nil or t. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 else if (!EQ (tem, elt))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2587 { elt = tem; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2589 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2591
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2592 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2593 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2594 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2595
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2596 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2597 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2598 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2599 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2600 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2601 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2602 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2603 according to whether the symbol's value is non-nil or nil. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2604 car = XCONS (elt)->car;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2605 if (XTYPE (car) == Lisp_Symbol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2606 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2607 tem = Fboundp (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2608 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2609 if (XTYPE (elt) != Lisp_Cons)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2610 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2611 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2612 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2613 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2614 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2615 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2616 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2617 { elt = XCONS (elt)->car; goto tail_recurse; }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2618 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2619 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2620 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2621 and if possible find the caddr and use that. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2622 elt = XCONS (elt)->cdr;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2623 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2624 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2625 else if (XTYPE (elt) != Lisp_Cons)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2626 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2627 elt = XCONS (elt)->car;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2628 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2629 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2630 else if (XTYPE (car) == Lisp_Int)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2631 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632 register int lim = XINT (car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2634 if (lim < 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2635 /* Negative int means reduce maximum width.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2636 DO NOT change MINENDCOL here!
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2637 (20 -10 . foo) should truncate foo to 10 col
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2638 and then pad to 20. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2639 maxendcol = min (maxendcol, hpos - lim);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2640 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2642 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2643 current maximum. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2644 lim += hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2645 if (lim > maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2646 lim = maxendcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2647 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2648 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2649 that is beyond the current truncation point. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2650 if (lim > minendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2651 minendcol = lim;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2652 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2653 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2654 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2655 else if (XTYPE (car) == Lisp_String || XTYPE (car) == Lisp_Cons)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2656 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2657 register int limit = 50;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2658 /* LIMIT is to protect against circular lists. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2659 while (XTYPE (elt) == Lisp_Cons && --limit > 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2660 && hpos < maxendcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 hpos = display_mode_element (w, vpos, hpos, depth,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2663 hpos, maxendcol,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2664 XCONS (elt)->car);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2665 elt = XCONS (elt)->cdr;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2666 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2667 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2668 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2669 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2670
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2671 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2672 invalid:
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2673 return (display_string (w, vpos, "*invalid*", -1, hpos, 0,
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2674 minendcol, maxendcol));
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2675 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2676
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2677 end:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2678 if (minendcol > hpos)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2679 hpos = display_string (w, vpos, "", 0, hpos, 0, minendcol, -1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2680 return hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2681 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2682
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2683 /* Return a string for the output of a mode line %-spec for window W,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2684 generated by character C and width MAXWIDTH. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2685
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
2686 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
2687
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2688 static char *
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2689 decode_mode_spec (w, c, maxwidth)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2690 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2691 register char c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2692 register int maxwidth;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2693 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2694 Lisp_Object obj = Qnil;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2695 FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2696 char *decode_mode_spec_buf = (char *) FRAME_TEMP_GLYPHS (f)->total_contents;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2697
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2698 if (maxwidth > FRAME_WIDTH (f))
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2699 maxwidth = FRAME_WIDTH (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2700
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2701 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2702 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2703 case 'b':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2704 obj = current_buffer->name;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2705 #if 0
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2706 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2707 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2708 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2709 decode_mode_spec_buf[maxwidth - 1] = '\\';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2710 decode_mode_spec_buf[maxwidth] = '\0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2711 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2712 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2713 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2714 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2715
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2716 case 'f':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2717 obj = current_buffer->filename;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2718 #if 0
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2719 if (NILP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2720 return "[none]";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2721 else if (XTYPE (obj) == Lisp_String && XSTRING (obj)->size > maxwidth)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2722 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2723 bcopy ("...", decode_mode_spec_buf, 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2724 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2725 decode_mode_spec_buf + 3, maxwidth - 3);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2726 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2727 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2728 #endif
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2729 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2730
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2731 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2732 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2733 int startpos = marker_position (w->start);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2734 int line, linepos, topline;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2735 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2736 Lisp_Object tem;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2737 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2738
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2739 /* 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
2740 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2741 if (EQ (w->base_line_pos, w->buffer))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2742 return "??";
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2743
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2744 /* If the buffer is very big, don't waste time. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2745 if (ZV - BEGV > line_number_display_limit)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2746 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2747 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2748 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2749 return "??";
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2750 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2751
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2752 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2753 && !NILP (w->base_line_pos)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2754 && XFASTINT (w->base_line_pos) <= marker_position (w->start))
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2755 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2756 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2757 linepos = XFASTINT (w->base_line_pos);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2758 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2759 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2760 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2761 line = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2762 linepos = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2763 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2764
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2765 /* Count lines from base line to window start position. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2766 nlines = display_count_lines (linepos, startpos, startpos, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2767
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2768 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2769
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2770 /* 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
2771 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
2772 "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
2773 go back past it. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2774 if (startpos == BEGV)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2775 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2776 XFASTINT (w->base_line_number) = topline;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2777 XFASTINT (w->base_line_pos) = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2778 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2779 else if (nlines < height + 25 || nlines > height * 3 + 50
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2780 || linepos == BEGV)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2781 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2782 int limit = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2783 int position;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2784 int distance = (height * 2 + 30) * 200;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2785
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2786 if (startpos - distance > limit)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2787 limit = startpos - distance;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2788
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2789 nlines = display_count_lines (startpos, limit,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2790 -(height * 2 + 30),
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2791 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2792 /* 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
2793 200 chars per line,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2794 give up on line numbers for this window. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2795 if (position == startpos - distance)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2796 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2797 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2798 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2799 return "??";
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2800 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2801
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2802 XFASTINT (w->base_line_number) = topline - nlines;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2803 XFASTINT (w->base_line_pos) = position;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2804 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2805
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2806 /* Now count lines from the start pos to point. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2807 nlines = display_count_lines (startpos, PT, PT, &junk);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2808
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2809 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2810 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2811
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2812 /* Make the string to show. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2813 sprintf (decode_mode_spec_buf, "%d", topline + nlines);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2814 return decode_mode_spec_buf;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2815 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2816 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2817
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2818 case 'm':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2819 obj = current_buffer->mode_name;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2820 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2821
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2822 case 'n':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2823 if (BEGV > BEG || ZV < Z)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2824 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2825 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2826
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2827 case '*':
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2828 if (!NILP (current_buffer->read_only))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2829 return "%";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2830 if (MODIFF > current_buffer->save_modified)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2831 return "*";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2832 return "-";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2833
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2834 case 's':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2835 /* status of process */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2836 obj = Fget_buffer_process (Fcurrent_buffer ());
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
2837 if (NILP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2838 return "no process";
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2839 #ifdef subprocesses
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2840 obj = Fsymbol_name (Fprocess_status (obj));
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2841 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2842 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2843
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2844 case 't': /* indicate TEXT or BINARY */
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2845 #ifdef MSDOS
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2846 decode_mode_spec_buf[0]
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2847 = NILP (current_buffer->buffer_file_type) ? "T" : "B";
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2848 decode_mode_spec_buf[1] = 0;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2849 return decode_mode_spec_buf;
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2850 #else /* not MSDOS */
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2851 return "T";
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2852 #endif /* not MSDOS */
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
2853
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2854 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2855 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2856 int pos = marker_position (w->start);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2857 int total = ZV - BEGV;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2858
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2859 if (XFASTINT (w->window_end_pos) <= Z - ZV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2860 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2861 if (pos <= BEGV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2862 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2863 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2864 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2865 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2866 else if (pos <= BEGV)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2867 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2868 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2869 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2870 total = ((pos - BEGV) * 100 + total - 1) / total;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2871 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2872 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2873 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2874 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2875 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2876 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2877 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2878 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2879
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2880 case '%':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2881 return "%";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2882
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2883 case '[':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2884 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2885 int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2886 char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2887
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2888 if (command_loop_level > 5)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2889 return "[[[... ";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2890 p = decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2891 for (i = 0; i < command_loop_level; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2892 *p++ = '[';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2893 *p = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2894 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2895 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2896
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2897 case ']':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2898 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2899 int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2900 char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2901
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2902 if (command_loop_level > 5)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2903 return " ...]]]";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2904 p = decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2905 for (i = 0; i < command_loop_level; i++)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2906 *p++ = ']';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2907 *p = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2908 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2909 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2910
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2911 case '-':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2912 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2913 register char *p;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2914 register int i;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2915
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2916 if (maxwidth < sizeof (lots_of_dashes))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2917 return lots_of_dashes;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2918 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2919 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2920 for (p = decode_mode_spec_buf, i = maxwidth; i > 0; i--)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2921 *p++ = '-';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2922 *p = '\0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2923 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2924 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2925 }
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 if (XTYPE (obj) == Lisp_String)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2929 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2930 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2931 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2932 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2933
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2934 /* Count up to N lines starting from FROM.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2935 But don't go beyond LIMIT.
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2936 Return the number of lines thus found (always positive).
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2937 Store the position after what was found into *POS_PTR. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2938
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2939 static int
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2940 display_count_lines (from, limit, n, pos_ptr)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2941 int from, limit, n;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2942 int *pos_ptr;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2943 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2944 int oldbegv = BEGV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2945 int oldzv = ZV;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2946 int shortage = 0;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2947
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2948 if (limit < from)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2949 BEGV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2950 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2951 ZV = limit;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2952
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2953 *pos_ptr = scan_buffer ('\n', from, n, &shortage);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2954
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2955 ZV = oldzv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2956 BEGV = oldbegv;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2957
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2958 if (n < 0)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2959 /* When scanning backwards, scan_buffer stops *after* the last newline
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2960 it finds, but does count it. Compensate for that. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2961 return - n - shortage - (*pos_ptr != limit);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2962 return n - shortage;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
2963 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2964
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2965 /* Display STRING on one line of window W, starting at HPOS.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2966 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
2967 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
2968 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
2969
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2970 TRUNCATE is GLYPH to display at end if truncated. Zero for none.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2971
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2972 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
2973 MAXCOL is the last column ok to end at. Truncate here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2974 -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
2975 Both count from the left edge of the frame, as does HPOS.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2976 The right edge of W is an implicit maximum.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2977 If TRUNCATE is nonzero, the implicit maximum is one column before the edge.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2978
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2979 Returns ending hpos */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2980
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2981 static int
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2982 display_string (w, vpos, string, length, hpos, truncate, mincol, maxcol)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2983 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2984 unsigned char *string;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
2985 int length;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2986 int vpos, hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2987 GLYPH truncate;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2988 int mincol, maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2989 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2990 register int c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2991 register GLYPH *p1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2992 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
2993 int tab_width = XINT (XBUFFER (w->buffer)->tab_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2994 register GLYPH *start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2995 register GLYPH *end;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
2996 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
2997 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2998 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2999 int window_width = XFASTINT (w->width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3000
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3001 /* Use the standard display table, not the window's display table.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3002 We don't want the mode line in rot13. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3003 register struct Lisp_Vector *dp = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3004
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3005 if (XTYPE (Vstandard_display_table) == Lisp_Vector
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3006 && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3007 dp = XVECTOR (Vstandard_display_table);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3008
2324
24cd3df6f184 (display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents: 2303
diff changeset
3009 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011 p1 = p1start;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3012 start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3013 end = start + window_width - (truncate != 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3014
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3015 if ((window_width + XFASTINT (w->left)) != FRAME_WIDTH (f))
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3016 {
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
3017 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
3018 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3019 int i;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3020
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
3021 for (i = 0; i < VERTICAL_SCROLL_BAR_WIDTH; i++)
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3022 *end-- = ' ';
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3023 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3024 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3025 *end-- = '|';
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
3026 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3027
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3028 if (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029 end = desired_glyphs->glyphs[vpos] + maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3030 if (maxcol >= 0 && mincol > maxcol)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3031 mincol = maxcol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3032
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3033 while (p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3034 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3035 if (length == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3036 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037 c = *string++;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3038 /* Specified length. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3039 if (length >= 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3040 length--;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3041 /* Unspecified length (null-terminated string). */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3042 else if (c == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3043 break;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3044
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3045 if (c >= 040 && c < 0177
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
3046 && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3047 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3048 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3049 *p1 = c;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3050 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3051 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3052 else if (c == '\t')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3053 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3054 do
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3055 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3056 if (p1 >= start && p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3057 *p1 = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3058 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3059 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3060 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3061 }
2065
32afcdd08efe (copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents: 1992
diff changeset
3062 else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
3063 p1 = copy_rope (p1, start, DISP_CHAR_VECTOR (dp, c), 0);
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
3064 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3065 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3066 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3067 *p1 = (dp && XTYPE (DISP_CTRL_GLYPH (dp)) == Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3068 ? XINT (DISP_CTRL_GLYPH (dp)) : '^');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3069 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3070 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3071 *p1 = c ^ 0100;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3072 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3073 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3074 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3075 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3076 if (p1 >= start)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3077 *p1 = (dp && XTYPE (DISP_ESCAPE_GLYPH (dp)) == Lisp_Int
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3078 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\');
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3079 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3080 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3081 *p1 = (c >> 6) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3082 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3083 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3084 *p1 = (7 & (c >> 3)) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3085 p1++;
368
d04df545062f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 331
diff changeset
3086 if (p1 >= start && p1 < end)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3087 *p1 = (7 & c) + '0';
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3088 p1++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3089 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3090 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3091
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
3092 if (c && length > 0)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3093 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3094 p1 = end;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3095 if (truncate) *p1++ = truncate;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3096 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3097 else if (mincol >= 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3098 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3099 end = desired_glyphs->glyphs[vpos] + mincol;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3100 while (p1 < end)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3101 *p1++ = SPACEGLYPH;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3102 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3103
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3104 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3105 register int len = p1 - desired_glyphs->glyphs[vpos];
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3106
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3107 if (len > desired_glyphs->used[vpos])
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3108 desired_glyphs->used[vpos] = len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3109 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3110
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3111 return len;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3112 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3113 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3114
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3115 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3116 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3117 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3118 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3119 staticpro (&last_arrow_string);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3120 last_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3121 last_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3122
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3123 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
3124 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3125 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3126
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3127 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3128 "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
3129 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3130 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3131 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3132
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3133 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3134 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3135 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3136
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3137 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3138 "*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
3139 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
3140 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
3141
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3142 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3143
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3144 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3145 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3146 "*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
3147 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3148
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3149 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3150 "*Non-nil means use inverse video for the mode line.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3151 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3152
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3153 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit,
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3154 "*Maximum buffer size for which line number should be displayed.");
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
3155 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
3156
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
3157 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
3158 "*Non-nil means highlight 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
3159 highlight_nonselected_windows = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3160 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3161
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3162 /* initialize the window system */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3163 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3164 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3165 Lisp_Object root_window;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 #ifndef COMPILER_REGISTER_BUG
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3167 register
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3168 #endif /* COMPILER_REGISTER_BUG */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3169 struct window *mini_w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3170
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3171 this_line_bufpos = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3172
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3173 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
3174 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3175
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3176 echo_area_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3177 previous_echo_glyphs = 0;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3178
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3179 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3180 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3181 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (root_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3182 XFASTINT (XWINDOW (root_window)->top) = 0;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3183 set_window_height (root_window, FRAME_HEIGHT (f) - 1, 0);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3184 XFASTINT (mini_w->top) = FRAME_HEIGHT (f) - 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3185 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3186
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3187 XFASTINT (XWINDOW (root_window)->width) = FRAME_WIDTH (f);
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
3188 XFASTINT (mini_w->width) = FRAME_WIDTH (f);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3189 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3190 }